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
Removed duplication of chart
Merge pull request #51 from kurokoda/master

Removed duplicate chart