folder cleanup
overwriting user.rb
commit before pull
Merge branch 'master' of https://github.com/cicadas-2014/percolator into homepage_login
first problem test passes
moving forms to index page
initial merge
commit before adding flash
take out unused instance variables
fix spacing
add (commented out) skeleton for create solution feature
Merge branch 'master' of https://github.com/cicadas-2014/percolator into create_solution_feature
all tests currently passing
Merge pull request #32 from mcclungt/mvp01

all tests currently passing
add event listener for percolate/add solution button
add button to problem show page
committing current state in order to pull successful tests update
Merge branch 'master' of github.com:cicadas-2014/percolator

Conflicts:
	app/assets/javascripts/percolator.js
integrate solution create event listener into percolator.js file
Merge pull request #34 from gitnasty/master

Add button and event listener for solution create