完成演示ppt和项目评价
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/loginInfoTemp.ser
Merge branch 'master' of https://github.com/cylong1016/NJULily