pull before merge
Merge branch 'master' of https://github.com/cicadas-2014/percolator into back2basics
heroku
Merge branch 'master' of github.com:cicadas-2014/percolator into data
Many changes in order to get correct window data for reinitialization of raphael assets

* added data helper to return correctly formatted problem data

* cleaned out excessive console logs

* rebuild rafael assets on ajax response
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
only correct buttons show up on bubble view, changed button text
Merge pull request #91 from mcclungt/back2basics

only correct buttons show up on bubble view, changed button text
comments fix
comments fix
comments fix
Voting behavior implemented

* Votes added to seed file

* Votes effect solution scale
Merge pull request #93 from cicadas-2014/comments

Comments
Merge branch 'master' of github.com:cicadas-2014/percolator

Conflicts:
	app/assets/javascripts/Solution.js
	app/assets/javascripts/percolator.js
Merge branch 'master' of github.com:cicadas-2014/percolator

Conflicts:
	app/assets/javascripts/percolator.js
css experimentation