diff --git a/README.md b/README.md
index e3cf190..130af0a 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,58 @@
-<<<<<<< HEAD
 # transfer.sh
 
+Easy and fast file sharing from the command-line. This code contains the server with everything you need to create your own instance.
 
-Development
+[![Build Status](https://travis-ci.org/dutchcoders/go-virustotal.svg?branch=master)](https://travis-ci.org/dutchcoders/go-virustotal)
 
+## Usage
+
+```
+Upload:
+$ curl --upload-file ./hello.txt https://transfer.sh/hello.txt
+
+Encrypt & upload:
+$ cat /tmp/hello.txt|gpg -ac -o-|curl -X PUT --upload-file "-" https://transfer.sh/test.txt
+
+Download & decrypt:
+$ curl https://transfer.sh/1lDau/test.txt|gpg -o- > /tmp/hello.txt
+
+Upload to virustotal:
+$ curl -X PUT --upload-file nhgbhhj https://transfer.sh/test.txt/virustotal
+
+Add alias to .bashrc or .zshrc:
+===
+transfer() {
+    # write to output to tmpfile because of progress bar
+    tmpfile=$( mktemp -t transfer )
+    curl --progress-bar --upload-file $1 https://transfer.sh/$(basename $1) >> $tmpfile;
+    cat $tmpfile;
+    rm -f $tmpfile;
+}
+
+alias transfer=transfer
+===
+$ transfer test.txt
+```
+
+## Development
 
 - grunt serve
 - grunt build
-=======
-transfer.sh
-===========
->>>>>>> 7a208c9efbfc3f0a063bff4edf43fbbf76e1371f
+
+- sh transfer-server/run.sh 
+
+## Contributions
+
+Contributions are welcome.
+
+## Creators 
+
+**Remco Verhoef**
+- <https://twitter.com/remco_verhoef>
+- <https://twitter.com/dutchcoders>
+
+**Uvis Grinfelds**
+
+## Copyright and license
+
+Code and documentation copyright 2011-2014 Remco Verhoef. Code released under [the MIT license](LICENSE).