Adding menu
Removing library
Merge branch 'master' of https://github.com/IanPudney/proton

Conflicts:
	.gitignore
	DerekWork/Assets/DerekScripts/MyoTrack.cs
	DerekWork/Assets/TestRoom.unity
	DerekWork/DerekWork-csharp.sln
	DerekWork/DerekWork.sln
	DerekWork/DerekWork.userprefs
	DerekWork/Library/CurrentLayout.dwlt
	DerekWork/Library/InspectorExpandedItems.asset
	DerekWork/Library/expandedItems
	DerekWork/Library/shadercompiler-1.log
Temporarily not allowing calibration of oculus
Merge branch 'master' of https://github.com/IanPudney/proton

Conflicts:
	DerekWork/Assembly-CSharp-vs.csproj
	DerekWork/Assembly-CSharp.csproj
	DerekWork/Assets/DerekScripts/MyoTrack.cs
	DerekWork/Assets/TestRoom.unity
	DerekWork/DerekWork-csharp.sln
	DerekWork/DerekWork.sln
	DerekWork/DerekWork.userprefs
Merge branch 'master' of https://github.com/IanPudney/proton

Conflicts:
	DerekWork/DerekWork.userprefs
Merge branch 'master' of https://github.com/IanPudney/proton