Settings page works
Merge branch 'master' of https://github.com/cscott126/PopQuiz

Conflicts:
	popup.js