save
Merge branch 'yaoyiyao'

Conflicts:
	.gitignore
Merge branch 'yaoyiyao'
搭建摇一摇页面框架
实现投票统计