changed tilemap to entitymap
Merge branch 'gui3' of https://github.com/waddy500/pygame into gui3

Conflicts:
	data/map.xml