got the beginning of catching pokemon
Merge remote-tracking branch 'Joey/master'