Merge pull request #1 from trunks518/CM

Cm
Updating

Signed-off-by: Captain Murphy <captain@teamduck.com>
Fixing git again

Signed-off-by: Captain Murphy <captain@teamduck.com>
Merge branch 'CM' of ssh://github.com/trunks518/HoO-Unity into CM

Conflicts:
	Hearts of Oak/Assembly-UnityScript-firstpass-vs.unityproj
	Hearts of Oak/Assembly-UnityScript-firstpass.unityproj
	Hearts of Oak/Assets/Materials/OceanIndie.mat
	Hearts of Oak/Assets/Scripts/MainCameraLOD.cs
	Hearts of Oak/Assets/Scripts/MainCameraLOD.cs.meta
	Hearts of Oak/Assets/plyData/DiaQ/DiaQ.prefab
	Hearts of Oak/Assets/plyData/System/data.asset
	Hearts of Oak/Hearts of Oak.userprefs
	Hearts of Oak/Library/shadercompiler-1.log
	Hearts of Oak/ProjectSettings/TagManager.asset

Signed-off-by: Captain Murphy <captain@teamduck.com>