tweaks
more work
tweaks
Merge branch 'master' of https://github.com/PennApps2014Spring/fb_quiz
working
Conflicts:

	templates/index.html