got it to work on my computer
Merge branch 'master' of github.com:cswanson310/nutrition-ed

Conflicts:
	app/assets/stylesheets/application.css.scss
added some better styling on hints and selecting answers