merge
Merge branch 'master' of https://github.com/TDT4240-Exercises/TDT4240-Project

Conflicts:
	x2-gameproject/X2Game.sln
	x2-gameproject/x2-gameproject/x2-gameproject/MainMenuState.cs