Updated .gitignore
fuck git
Merge branch 'master' of github.com:Johanw123/MonoPlatformerGame

Conflicts:
	.gitignore
	MonoPlatformerGame/DedicatedServerConsole/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
	MonoPlatformerGame/MonoPlatformerGame/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
Removed user-specific files which should not be comitted
Merge branch 'master' of github.com:Johanw123/MonoPlatformerGame