Changes to CSS and application.html
Merge branch 'master' into kenny

Merging John's JS changes to mine to merge back to Master.
Added glyphicon
Merge pull request #14 from kplandes/kenny

Kenny