Map
Merge branch 'master' of github.com:fm2munsh/Pokemon
Maps
Character sprites
Merge branch 'master' of github.com:fm2munsh/Pokemon

Conflicts:
	public/js/app.js
	public/js/modules/main.js