Changed introStage to not enter mainMenu until all buttons are released.
This is to prevent the bug where if you press a hotkey while in the introState one would go directly to a new state from mainMenu when releasing the key.
Merge branch 'master' of https://github.com/TDT4240-Exercises/TDT4240-Project
Added options screen and implemented way to change screen resolution.
Merge branch 'master' of https://github.com/TDT4240-Exercises/TDT4240-Project

Conflicts:
	x2-gameproject/x2-gameproject/x2-gameproject/gamestates/MainMenuState.cs
	x2-gameproject/x2-gameproject/x2-gameproject/util/ResourceManager.cs
Merge branch 'master' of https://github.com/TDT4240-Exercises/TDT4240-Project

Conflicts:
	x2-gameproject/x2-gameproject/x2-gameproject/util/ResourceManager.cs