Update readme
Update readme
Added basic battles
Merge branch 'master' of github.com:fm2munsh/Pokemon into server

Conflicts:
	public/js/app.js
	public/js/modules/globals.js
	public/js/modules/people.js
	public/js/modules/scenes/map.js
	server/js/maps.js
Spritesheet bounds