Primeiro commit
Merge https://github.com/paulophp/sailsapp

Conflicts:
	README.md