Fixing bug preventing access of actual data
Merge branch 'master' of github.com:cicadas-2014/percolator

Conflicts:
	app/assets/javascripts/percolator.js
added passing solution model specs
Merge branch 'master' of https://github.com/cicadas-2014/percolator into solution_model_spec
added problem association test
Merge pull request #41 from gitnasty/add_solution_create_ajax

Make problem page dynamic
Merge branch 'master' of https://github.com/cicadas-2014/percolator into solution_model_spec
added tests for form visibility
Merge branch 'master' of github.com:cicadas-2014/percolator

Conflicts:
	app/assets/javascripts/percolator-model.js
	app/assets/javascripts/percolator.js
	app/views/problems/show.html.erb
Fixing code broken as art of a perhaps overly optimistic refactor attempt.
Merge pull request #42 from mcclungt/feature_specs

added specs for form visibility
Adding icons for upvoting and downvoting
Merge branch 'master' of github.com:cicadas-2014/percolator

Conflicts:
	app/assets/stylesheets/percolator.css
Deleted scss file, as it was wreaking havoc all up on our tests
Merge pull request #43 from kurokoda/master

Animation fixes and button styling
move parseJSON window.data variable outside of the if raphael block to prevent json parse object from being undefined
Merge pull request #44 from gitnasty/merge_7_6_1229

move parseJSON window.data variable outside of the if raphael block to p...
move disqus comment block inside problem container