More Level Design
c
Merge branch 'master' of https://github.com/abagraba/Platformer

Conflicts:
	Assets/Scene.unity
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper