vetkje ka d her e :)
Merge branch 'master' of https://github.com/gerr8ard/awsm-see-sharp-game

Conflicts:
	Prosjekt_Programmering_3/Prosjekt_Programmering_3.v12.suo
	Prosjekt_Programmering_3/awsmSeeSharpGame/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Prosjekt_Programmering_3/awsmSeeSharpGame/obj/Debug/awsmSeeSharpGame.csproj.FileListAbsolute.txt