update tilemap
Merge branch 'master' of https://github.com/GuBaDa/SuperCrateClone

Conflicts:
	Assets/Sprites/normaltest.png.meta
	Assets/Sprites/tileMapData.asset
	Assets/Sprites/tileMapEditorData.asset
	Assets/tileTests.unity