Update README.md
Merge branch 'master' of github.com:jomaxx/scuba.js

Conflicts:
	README.md