update language
add artist name
update artist name
Merge branch 'master' of https://github.com/liuzenan/wowcheer

Conflicts:
	app.js
	views/layout.jade