Signed-off-by: unknown <cele@Jacey.cn.ibm.com>
Merge branch 'HEAD' of https://github.com/nanqunc/SmileVirus.git

Conflicts:
	routes/vote.js
	views/planning.jade

Signed-off-by: unknown <cele@Jacey.cn.ibm.com>
Merge branch 'HEAD' of https://github.com/nanqunc/SmileVirus.git
Signed-off-by: unknown <cele@Jacey.cn.ibm.com>
Merge branch 'HEAD' of https://github.com/nanqunc/SmileVirus.git