fixed tooltip mistype
removed swap
Merge branch 'master' of https://github.com/TSA-HCI573/PetProject into Steven