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

Conflicts:
	New Detroit Project/UnityVS.New Detroit Project.v11.suo