idk
merging everything
working on showed logged in user
Merge branch 'master' of https://github.com/dheckman/question_box into toresiss24

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/layouts/application.html.erb
minor changes to display
tweaks
fixed merge issues
Merge branch 'master' of https://github.com/dheckman/question_box
Merge branch 'master' into toresiss24
toggle header
stuff
toggle
stuff
Merge pull request #13 from dheckman/toresiss24

Toresiss24