messed around with css, pretty bad
Merge branch 'master' into john

merged master
Merge pull request #40 from jpberry0623/john

messed around with css, pretty bad