trashing sails
Merge branch 'master' of github.com:pcw216/ditto

Conflicts:
	Gruntfile.js
	package.json