commit
commit

Conflicts:
	app.js
Merge branch 'master' of github.com:fwjyttbtx/microblog
add commit