fix
Merge branch 'master' of https://github.com/Johanw123/MonoPlatformerGame

Conflicts:
	MonoPlatformerGame/DedicatedServerConsole/bin/Release/DedicatedServerConsole.exe
	MonoPlatformerGame/DedicatedServerConsole/bin/Release/DedicatedServerConsole.pdb
	MonoPlatformerGame/DedicatedServerConsole/obj/Release/DedicatedServerConsole.csproj.FileListAbsolute.txt
	MonoPlatformerGame/DedicatedServerConsole/obj/Release/DedicatedServerConsole.csprojResolveAssemblyReference.cache
	MonoPlatformerGame/DedicatedServerConsole/obj/Release/DedicatedServerConsole.exe
	MonoPlatformerGame/DedicatedServerConsole/obj/Release/DedicatedServerConsole.pdb
	MonoPlatformerGame/MonoPlatformerGame.suo
	MonoPlatformerGame/MonoPlatformerGame.v11.suo
	MonoPlatformerGame/MonoPlatformerGame/bin/WindowsGL/Release/MonoPlatformerGame.exe
	MonoPlatformerGame/MonoPlatformerGame/bin/WindowsGL/Release/MonoPlatformerGame.pdb
	MonoPlatformerGame/MonoPlatformerGame/bin/WindowsGL/Release/MonoPlatformerGame.vshost.exe
	MonoPlatformerGame/MonoPlatformerGame/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
	MonoPlatformerGame/MonoPlatformerGame/obj/x86/Release/MonoPlatformerGame.csproj.FileListAbsolute.txt
	MonoPlatformerGame/MonoPlatformerGame/obj/x86/Release/MonoPlatformerGame.exe
	MonoPlatformerGame/MonoPlatformerGame/obj/x86/Release/MonoPlatformerGame.pdb
	MonoPlatformerGame/MonoPlatformerGameLinux/bin/Release/MonoPlatformerGameLinux.exe
	MonoPlatformerGame/MonoPlatformerGameLinux/bin/Release/MonoPlatformerGameLinux.pdb
	MonoPlatformerGame/MonoPlatformerGameLinux/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
	MonoPlatformerGame/MonoPlatformerGameLinux/obj/x86/Release/MonoPlatformerGameLinux.csproj.FileListAbsolute.txt
	MonoPlatformerGame/MonoPlatformerGameLinux/obj/x86/Release/MonoPlatformerGameLinux.csprojResolveAssemblyReference.cache
	MonoPlatformerGame/MonoPlatformerGameLinux/obj/x86/Release/MonoPlatformerGameLinux.exe
	MonoPlatformerGame/MonoPlatformerGameLinux/obj/x86/Release/MonoPlatformerGameLinux.pdb
aaahaaa
Merge branch 'master' of https://github.com/Johanw123/MonoPlatformerGame

Conflicts:
	MonoPlatformerGame/DedicatedServerConsole/bin/Release/DedicatedServerConsole.exe
	MonoPlatformerGame/DedicatedServerConsole/bin/Release/DedicatedServerConsole.pdb
	MonoPlatformerGame/DedicatedServerConsole/obj/Release/DedicatedServerConsole.csproj.FileListAbsolute.txt
	MonoPlatformerGame/DedicatedServerConsole/obj/Release/DedicatedServerConsole.csprojResolveAssemblyReference.cache
	MonoPlatformerGame/DedicatedServerConsole/obj/Release/DedicatedServerConsole.exe
	MonoPlatformerGame/DedicatedServerConsole/obj/Release/DedicatedServerConsole.pdb
	MonoPlatformerGame/DedicatedServerConsole/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache