push to pull
Merge branch 'master' of https://github.com/JoshCooper417/miamar

Conflicts:
	main/views/quiz.jade
Revert 24d86c9..a547daa

This rolls back to commit 24d86c91727b47362d6344f9b6ffedd8a116081c.
wat
Revert 8f648a2..507e8b0

This rolls back to commit 8f648a28cc43133f895b8148c0fdad64941bc2cd.