ParticleEngine is now thread-safe
Updated various classes to follow C# code convention
Merge branch 'master' of https://github.com/TDT4240-Exercises/TDT4240-Project

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