offline
Merge branch 'master' of https://github.com/maxi-jp/Project_NewDetroit

Conflicts:
	New Detroit Project/Assets/NewDetroit/Scenes/NewDetroit01_Jacob.unity
	New Detroit Project/ProjectSettings/EditorBuildSettings.asset
	New Detroit Project/UnityVS.New Detroit Project.v11.suo
	New Detroit Project/obj/Debug/UnityVS.New Detroit Project.CSharp.dll
	New Detroit Project/obj/Debug/UnityVS.New Detroit Project.CSharp.pdb