styling changes
Merge branch 'master' into mybranch
Merge pull request #6 from malloryreuls/mybranch

Mybranch