just some tweaking
no change
tweaking
merge

Conflicts:
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Scenes/Main.unity
	HelicopterGame-csharp.sln
	HelicopterGame.sln
	Library/EditorUserBuildSettings.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/34/34a4184c744c142459f3d871e1c32aff
	Library/metadata/45/450d37ba05c4a4951af6736d34b85d82
	Library/metadata/52/52c5b577513224dfcb96a58f7b54ddf7
	Library/metadata/73/733241ebd11209e4d80b7b47fd2f308d
	Library/metadata/79/79b8653fdb2441d4cad3082d2dabc679
	Library/metadata/7c/7c888d20bba9c4f24bc2629474d2cc18
	Library/metadata/7f/7fdbe588caba2134caed87622f920f8f
	Library/metadata/a9/a944ab20703ad4c1ba6f2d508e7bcf9f
	Library/metadata/ae/ae8f6e7b67f05408e91e60e9d6f00a37
	Library/metadata/bc/bc7095f3a6842ab468d7641ea42d8260
	Library/metadata/c0/c08b276a8a3664208b3689433099960f