first commit
Merge branch 'master' of https://github.com/snazzyjames/eve-sails

Conflicts:
	README.md