MAP_Version 0.5
Merge https://github.com/maxi-jp/Project_NewDetroit

Conflicts:
	New Detroit Project/Assets/NewDetroit/Materials/RobotBase_Material.mat
	New Detroit Project/Assets/NewDetroit/Materials/TheStinkySquid_Material.mat
	New Detroit Project/Assets/NewDetroit/Scenes/NewDetroit01.unity
	New Detroit Project/Assets/Standard Assets/Water (Pro Only)/Water4/Sources/Materials/Water4Example.mat