welcome page changes
Merge branch 'master' of https://github.com/noraw/ClassQuiz
app.js updated
Merge branch 'master' of https://github.com/noraw/ClassQuiz

Conflicts:
	app.js