Update hahahah.txt
Merge branch 't2' of https://github.com/xianlewang/team17