working on fixing quiz results
working on fixing quiz results
Merge branch 'master' of github.com:shmems11/uncomfort

Conflicts:
	app/assets/stylesheets/welcome.css.scss