Styles/Merging
Merge branch 'master' of https://github.com/msntrnr/yallywood
A lot of styling updates