confliction
Merge branch 'master' of git://github.com/yyexplore/bang into yyexplore-master

Conflicts:
	haha1