Loki can now die
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Prefabs/Loki.prefab