Style Tweaks
Merge branch 'master' of https://github.com/TSA-HCI573/PetProject into Steven
Toned down style stuff
Merge branch 'master' of https://github.com/TSA-HCI573/PetProject into Steven
..