pre-pull commit
Merge branch 'master' of https://github.com/shrig94/pokemon

Conflicts:
	client/helperFunctions/catchrate.js
Merge branch 'master' of https://github.com/shrig94/pokemon
added battle functions
Merge branch 'master' of https://github.com/shrig94/pokemon