Trying to sync with laptop
Merge branch 'master' of https://github.com/dschutten/slow-blade

Conflicts:
	Camera_Experiment1/Camera_Experiment1-csharp.sln
	Camera_Experiment1/Camera_Experiment1.sln
	Camera_Experiment1/Library/CurrentLayout.dwlt
	Camera_Experiment1/Library/ScriptAssemblies/Assembly-CSharp.dll
	Camera_Experiment1/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Camera_Experiment1/Library/assetDatabase3
	Camera_Experiment1/Library/metadata/0f/0fdc261b8186e440899eff0182a2b094