add hai
Merge branch 'master' of https://github.com/hajimu/classwork

Conflicts:
	kawae.txt
zzz