update home page
Merge commit '865dc326c5cbf85d29e3c560e1dacb98fbe003b3'

Conflicts:
	app.js
	package.json
	routes/index.js
remove cache
remove cache
add procfile
update homepage layout
merged
update language
update language
add artist name
merge with master
Merge branch 'master' of https://github.com/liuzenan/wowcheer
fix bug of jade
update artist name
Merge branch 'master' of https://github.com/liuzenan/wowcheer

Conflicts:
	app.js
	views/layout.jade
add passport local
add footer
fix package dependency
fix route and added initialization for models
restructured app