commit2_zxz

readme changed by Xiaozhu
Merge branch 'master' of https://github.com/andsor/animated-happiness

Conflicts:
	README.md