Merge pull request #50 from gitnasty/master

Make solution circle rendering dynamic
Commit to get in sync
Merge branch 'master' of github.com:cicadas-2014/percolator

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/percolator.js
	app/views/problems/show.html.erb
vote
Removed duplication of chart
Merge pull request #51 from kurokoda/master

Removed duplicate chart
Merge branch 'master' of github.com:cicadas-2014/percolator
Merge pull request #52 from cicadas-2014/intertwine

Intertwine
commit before pull
Merge branch 'master' of https://github.com/cicadas-2014/percolator into improvements
Merge pull request #53 from mcclungt/improvements

created improvement model and model spec
Cleaning up display of problem view
Merge branch 'master' of github.com:cicadas-2014/percolator
Merge pull request #54 from kurokoda/master

Cleanup of JS and CSS
assimilate commented out javascript with master