joshuamaxwell/GroupProject1 — pull request #6 by kcampen (2014-01-31 19:31:57+00:00)
Title: Merge pull request #5 from joshuamaxwell/katy

Merging some style foundations