some momentum first pass
Merge branch 'master' of https://github.com/TonysAngels/TonyInDreamland

Conflicts:
	Platformer/Library/InspectorExpandedItems.asset
	Platformer/Library/ScriptAssemblies/Assembly-CSharp.dll
	Platformer/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Platformer/Library/assetDatabase3
	Platformer/ProjectSettings/EditorSettings.asset
new git ignore