presenterのjsスクリプト部分のバグ修正
コンフリ修正
Untrack static/quiz/css/quizcontent.css
Merge commit '7bd08d4b0cd717df3acc7782d5d9a50f0ec41c77'

Conflicts:
	static/quiz/css/quizcontent.css