idk
merging everything
Merge pull request #6 from dheckman/iss24

fixed header margin
Merge pull request #7 from dheckman/iss24

added info to readme and updated headings
Merge pull request #8 from dheckman/iss24

Iss24
Merge pull request #9 from dheckman/iss24

some clouds
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
Merge pull request #10 from dheckman/iss24

Iss24
tweaks
fixed merge issues
Merge branch 'master' of https://github.com/dheckman/question_box
Merge branch 'master' into toresiss24
Merge pull request #11 from dheckman/iss24

update to header and footer
Merge pull request #12 from dheckman/iss24

mushroom and things
toggle header
stuff
toggle
stuff