Updated testscene
Merge branch 'master' of https://github.com/stijndelaruelle/brainseden

Conflicts:
	Assets/Models/ColorSwatches.png.meta~48505cbf25f63f3de076a75505cf5d00b38178f1.meta
	Assets/Models/Lama.meta~48505cbf25f63f3de076a75505cf5d00b38178f1.meta
	Assets/Models/Rocks/Materials/ColorSwatches.mat.meta
	Assets/Terrain/TerrainMaterial.mat
	Assets/level.unity