first commit
Merge branch 'master' of https://github.com/duanruiqi/Popush_Modified

Conflicts:
	README.md
	app.js
	lib/popush
	models/runner.js
	static/css/popush.css
	static/images/character.png
	static/index.html
	static/js/localization/zh-cn.js
	static/js/popush.js