Merge pull request #78 from wangbailin/master

sync
compress files
Merge remote branch 'hello/master'

Conflicts:
	assets/img/logo.png
Merge pull request #79 from lucknessbuaa/master

compress
sync