Merge branch 'master' into development

* Master branch was ahead of development because of a few tweaks to the README on github.
Add explaination for '/upload' route to README.
Merge pull request #19 from JonathanTR/development

Development