sails,搭建基本架构
Merge branch 'master' of github.com:3dobe/bounty-hunter

Conflicts:
	README.md