Merge pull request #5 from joshuamaxwell/katy

Merging some style foundations