use supervisor
README
git crashed and re-inited...
Merge branch 'develop'

Conflicts:
	controllers/user.js
	models/user.js
	public/js/collections/user-clct.js
	public/js/views/templates.js
	routes.js
	views/index.jade
Merge branch 'master' of github.com:/ibigbug/Suoha
add comment
ignore
Merge branch 'master' into develop
user register