Fixing broken css
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