test commit
Merge branch 'master' of https://github.com/xiaojue/Hercules

Conflicts:
	app.js