fixed styles
Merge branch 'master' of https://github.com/gallonp/CS4460