Merge branch 'Rasmus'
Merge branch 'Rasmus'
Merge branch 'Rasmus'
Merge branch 'master' of https://github.com/rasmusenhorning/Dodger

Conflicts:
	Assets/GameSettings.cs