I'm not really sure what I just did
Merge branch 'master' of https://github.com/SeanAsby/Innlevering1

Conflicts:
	Innlevering1/Innlevering1/EnemyHandler.cs