to merge
mergeMerge branch 'master' of https://github.com/pkbriggs/Quizly

Conflicts:
	WebContent/js/CreateQuiz.js
Finished General Calculations