bug fix branch
Merge branch 'master' of https://github.com/GLoganDR/furry-farm into unit-testing

updating to sync w/ team members before working on unit testing

>>>>>>> 08be682950d9b55f53ba059023c0a72eb36b30dc
proposal unit test completed
unit test in progress
Merge branch 'master' of https://github.com/GLoganDR/furry-farm into unit-testing

git pull to sync w/ collaborators
Merge branch 'master' of https://github.com/GLoganDR/furry-farm into unit-testing

git pull to sync w/ collaborators
acceptPropsal in progress
#acceptProposal unit test in progress; pull from master
fixed conflicts for merge
Merge pull request #18 from GLoganDR/unit-testing

Unit testing
Merge branch 'master' of https://github.com/GLoganDR/furry-farm into style1