making

changes
Merge branch 'master' of https://github.com/photoguy2801/LostGame

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
	LostGame-csharp.sln
	LostGame.sln