Merge branch 'issue-47'
Merge branch 'issue-47'
Merge branch 'issue-41'
Merge branch 'master' of https://github.com/justinwalsh/daux.io
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Fix 404 typo

Fixes #79
Merge pull request #83 from kisselev/404-typo

404 typo