添加app.js
Merge branch 'master' of github.com:wufeixiang/wufeixiang.github.com

Conflicts:
	public/style/fullScreen.css