Styles and such.
Merge branch 'master' of https://github.com/jtmille3/Comp