Changes made by 汪 小 (neil2371596831@gmail.com).
Merge branch 'master' of https://github.com/dengshiying1989/happybaby.git

Conflicts:
	happybay/index.html
	happybay/scripts/happybaby.js
Changes made by 汪 小 (neil2371596831@gmail.com).