before pull
Merge branch 'master' of https://github.com/GLoganDR/furry-farm into style1
updating everyone
Merge pull request #13 from GLoganDR/style1

Style1