First Commit
Merge https://github.com/jvrdom/tecnicoya-sails

Conflicts:
	README.md