i didn't actually change anything, unity is weird

mbd
Merge branch 'master' of https://github.com/ttracey93/mbdgames

Conflicts:
	platformer/Assets/Scripts/CubeTrigger.cs.meta
	platformer/Library/CurrentLayout.dwlt
	platformer/Library/ScriptAssemblies/Assembly-CSharp.dll
	platformer/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	platformer/Library/assetDatabase3
	platformer/Library/guidmapper
	platformer/Library/metadata/39/39f35c84ddddc964784fb74e8bb1cb4d
	platformer/Library/metadata/86/86d5272f8b048c34e84353f06c3ab912