first commit
Merge branch 'master' of https://github.com/lytrc/angularjs-sailsjs

Conflicts:
	README.md