Merge branch 'master' of https://github.com/cicadas-2014/percolator into merge_7_8
add scss styling divs to comments
add styling to comment boxes
import new font.css.scss file
add @font-face syntax to allow webfont to load crossbrowser
Merge pull request #105 from gitnasty/merge_7_8

`Add @font-face declaration for cross-browser compatibility and asset pipeline font loading
Merge pull request #104 from kurokoda/master

Animation functionality has been implemented
improved color spectrum and changed bg (temp)
merged with color changes
changed scaling for solutions
solutions all expand to the same size
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