李佳奇 修改的 HaHa类
Merge branch 'master' of ssh://git@github.com/reign770/TestGitHub.git

Conflicts:
	src/Haha.java