Crappy iteration, seems worse than the last.  Preparing for pull.
Merge branch 'master' of https://github.com/IanPudney/proton

Conflicts:
	DerekWork/Assets/DerekPrefabs/Rocket.prefab
	DerekWork/Assets/DerekScripts/MyoTrack.cs
	DerekWork/Assets/TestRoom.unity
	DerekWork/DerekWork-csharp.sln
	DerekWork/DerekWork.sln
	DerekWork/DerekWork.userprefs
	DerekWork/Library/shadercompiler-1.log
New Character texture