Fix Camera (Kinda)
Merge branch 'master' of https://github.com/TDT4240-Exercises/TDT4240-Project

Conflicts:
	x2-gameproject/x2-gameproject/x2-gameproject/gamestates/PlayingState.cs
GitHub Fix
Merge branch 'master' of https://github.com/TDT4240-Exercises/TDT4240-Project
GitHub Sync Fix