commit before pull
opacity for solutions and better text wrapping
fixed conflicts
Merge branch 'master' of https://github.com/cicadas-2014/percolator into back2basics
zoomin and logout button fixed
Merge pull request #114 from gitnasty/merge_7_8

Fix css and improvement form
experimenting with color schemes
commit before pull
Merge branch 'master' of https://github.com/cicadas-2014/percolator into merge_7_8
Merge pull request #115 from gitnasty/merge_7_8

Demo Preso
Merge branch 'master' of https://github.com/cicadas-2014/percolator into back2basics
Fixing broken css
Merge pull request #116 from mcclungt/back2basics

stuffff
Beginning css refactor of show problem page
Merge branch 'master' of github.com:cicadas-2014/percolator

Conflicts:
	app/assets/stylesheets/percolator.css.scss
	app/views/layouts/application.html.erb
	app/views/problems/show.html.erb
Removing unresolved conflict tags
Adding zoom functionality to Percolator asset
Merge branch 'master' of https://github.com/cicadas-2014/percolator into merge_7_8
fix comment box so that it renders on zoom