Merge branch 'master' of https://github.com/zhaochunyu/BabyPlan

Conflicts:
	BabyPlan/views/index.jade
Merge branch 'master' of https://github.com/zhaochunyu/BabyPlan

Signed-off-by: chunchun <chunchun@chunchun-V>