working on styling
Merge branch 'master' into sammy_raza
more styling
conflicts resolved
derp
fuck this shit
Merge pull request #81 from nairys/sammy_raza

styling done