some styling changes
mergy merge

Merge branch 'master' of https://github.com/kolauren/rolling_bunnies