Sails init
Merge branch 'master' of github.com:Slantsoft/Monitor

Conflicts:
	README.md
Merged with remote