Made the moodBar increase depending on how far the pet or user has walked
Fixed merge conflict