Merge pull request #12 from kplandes/kenny

Kenny
Updated js file
Changes to CSS and application.html
Merge pull request #13 from jahoopes/master

Updated js file
Merge branch 'master' into kenny

Merging John's JS changes to mine to merge back to Master.