Started writing the code to keep track of rounds
resolved conflit in the controller file
Nicer results page.
Merge branch 'domisbranch' of https://github.com/tjalil/earthy into Josh_design
corrected the randomization to not pick same questions
Added slidy effect, changed colors
merged with action
cleaned up question.rb
Fixed case for images
Merge branch 'master' of https://github.com/tjalil/earthy
Included pry into Gemfile
Merge branch 'master' of github.com:tjalil/earthy
Cookies can now store user scores
pre-merge-to-master
Fixed conflicts
yeah
Added summary page, merged with Sanborn's branch
ressurected images