Merge pull request #38 from cicadas-2014/votes

Votes
commit before merge
Merge branch 'master' of https://github.com/cicadas-2014/percolator into mvp03
Fixing bug preventing access of actual data
Merge branch 'master' of github.com:cicadas-2014/percolator

Conflicts:
	app/assets/javascripts/percolator.js
Merge pull request #39 from mcclungt/mvp03

Mvp03
added passing solution model specs
Merge branch 'master' of https://github.com/cicadas-2014/percolator into solution_model_spec
added problem association test
add dynamic rendering of solution bubbles based on problem#
p out views to help visually locate elements
add quotes around javascript tag rendering of window.data
take out percolator model hard code data
change title/synopsis rendering to reflect problem number
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