Magic
Merge branch 'master' of https://github.com/JoachimHolmer/Rymdkyrka

Conflicts:
	Assets/test.unity
Magic!