Added randomly generated battles with wild Pokemon and end of battle
fixed making wild pokemon
Merge remote-tracking branch 'Joey/master'