update project page
Merge branch 'master' of https://github.com/liuzenan/wowcheer

Conflicts:
	views/project.jade