pulled group master
major changes to show page
background color change on show page
minor changes before heroku push
commented out scrollwheel in JS files for potential heroku fix
minor change
precompile before heroku push
Merge pull request #37 from tbuchanan/master

pull before presentation