ignore shit
Merge branch 'master' into andreas
Merge branch 'andreas'
Merge branch 'andreas'
Merge branch 'master' of https://github.com/rasmusenhorning/Dodger

Conflicts:
	.gitignore
	Assets/GameSettings.cs
	Assets/Menu.unity
	Assets/Units/Balls/Fireball.cs
	Assets/Units/Cannon/Shoot.cs
	Assets/Units/Laser/Lasercollider.cs
	Assets/Units/Player/PlatformerCharacter2D.cs
	Assets/Units/Player/Weapon.cs
	Assets/darkmap.unity
	ProjectSettings/TagManager.asset