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

Conflicts:
	public/javascripts/base.js

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

Conflicts:
	app.js
	routes/index.js

Signed-off-by: unknown <cele@Jacey.cn.ibm.com>