initial
Merge branch 'master' of github.com:knownasilya/sails-rethinkdb

Conflicts:
	README.md