andere blok
Merge branch 'master' of https://github.com/cvanherk/IndiGame_Android

Conflicts:
	Assets/Scenes/Game.unity
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/e2/e222feeb708e7d1419bc570811cbef2d