broken vertexmerge
Merge branch 'master' of https://github.com/jeichelbaum/kingBMJ

Conflicts:
	Assets/scripts/Interaction.cs