battle maps
Merge branch 'master' of https://github.com/D4rkFr4g/zRPG

Conflicts:
	textureLoader.cpp