merged Will's changes
craziness
put Gemfile.lock back under version control - Clinton said to
reverted problem controller
took :id out of param permit list
Merge branch 'master' of https://github.com/WillRussell/help
Merge pull request #3 from GeoffPurdy/master

added fields for solutions tried to problem view and problem controller