Fixed typo in pokemon,json
Merge branch 'master' of https://github.com/shrig94/pokemon
Merge branch 'master' of https://github.com/shrig94/pokemon
Merge branch 'master' of https://github.com/shrig94/pokemon
changes to login.html
Merge branch 'master' of https://github.com/shrig94/pokemon
Formula for determining whether a pokemon is caught
Merge branch 'master' of https://github.com/shrig94/pokemon