gammelt fra skole pc
Merge branch 'master' of https://github.com/gerr8ard/awsm-see-sharp-game

Conflicts:
	Prosjekt_Programmering_3/awsmSeeSharpGame/MainForm.cs
	Prosjekt_Programmering_3/awsmSeeSharpGame/UserControls/LoginControl.cs
	Prosjekt_Programmering_3/awsmSeeSharpGame/UserControls/NewUserControl.cs