Changed the start of PlayActivity to startActivityForResult so that the pet only gets happy when its done playing
fixed merge conflict