commit for sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	Alone/Assets/Final Assets/Imports.meta
	Alone/Library/CurrentLayout.dwlt
	Alone/Library/ScriptAssemblies/Assembly-CSharp.dll
	Alone/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Alone/Library/assetDatabase3
	Alone/Library/metadata/0f/0fe5a6581edd5d7479808982d6615836
	Alone/Library/metadata/3e/3ef5899a2d60a374ca130e021108660d
	Alone/Library/metadata/72/724e28e8a57f9b8428c50e338b71c7eb
	Alone/Library/metadata/bb/bb5c40f035af64144b5fcab35dd7d1f7
Merge branch 'master' of https://github.com/mangousteReborn/ProjectUnity

Conflicts:
	.gitignore
	Alone/Library/CurrentLayout.dwlt
	Alone/Library/assetDatabase3
	Alone/Library/metadata/0f/0fe5a6581edd5d7479808982d6615836
	Alone/Library/metadata/1c/1cebefc16e330e94194379a0d12cacf8
	Alone/Library/metadata/3e/3ef5899a2d60a374ca130e021108660d
	Alone/Library/metadata/72/724e28e8a57f9b8428c50e338b71c7eb
	Alone/Library/metadata/e0/e0b5bc91e41878641a9dd935b3f9a988