demo tmx 64 base
Merge branch 'master' of https://github.com/Angergard/Thwack-And-Bash-prototype

Conflicts:
	core/assets/textureatlas/Tiled/demo.tmx