pull before merge
Merge branch 'master' of https://github.com/cicadas-2014/percolator into back2basics
solution title now concatenates and displays better
solution title now concatenates and displays better
Merge pull request #90 from mcclungt/back2basics

fixed solution title wrapping
Fixing broken back button
Merge branch 'master' of github.com:cicadas-2014/percolator

Conflicts:
	app/assets/javascripts/Solution.js