pre-merge
Merge branch 'master' of https://github.com/GLoganDR/furry-farm into styling
last pre-merge
Merge branch 'master' of https://github.com/GLoganDR/furry-farm into styling
Merge pull request #20 from GLoganDR/styling

Styling