Merge branch 'master' of https://github.com/cicadas-2014/percolator into merge_7_8
Merge pull request #106 from mcclungt/back2basics

Solutions overhauled
Fixing front page css
Merge branch 'master' of github.com:cicadas-2014/percolator

Conflicts:
	app/assets/javascripts/Solution.js
Fixing solution display in detail window
Merge pull request #107 from kurokoda/master

Cleanup index page
commit before pull
votes
git spacing
-style description and comments by assigning relative values to dimensions(%)
add viewport for mobile responsiveness
-move vote buttons to be in line with synopsis
Changing frame font color
Merge branch 'master' of github.com:cicadas-2014/percolator
votes
Merge branch 'master' of github.com:cicadas-2014/percolator
remove unused code
include fonts.css.scss in precompile
Merge pull request #108 from cicadas-2014/votes

Votes
merge workflow with team