Revert "공격, 점프 버튼 매칭"

This reverts commit 4a24f44eaec3375f0c18e683eeb66915d7d6c5e5.

Conflicts:
	NotInMyRoom/Assets/Controllers/Animator/CharacterController.controller
	NotInMyRoom/Assets/Scenes/Main.unity
	NotInMyRoom/Assets/Scripts/Player/CharacterControllerLogic.cs
	NotInMyRoom/Library/AssetServerCacheV3
	NotInMyRoom/Library/CurrentLayout.dwlt
	NotInMyRoom/Library/InspectorExpandedItems.asset
	NotInMyRoom/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	NotInMyRoom/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	NotInMyRoom/Library/ScriptAssemblies/Assembly-CSharp.dll
	NotInMyRoom/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	NotInMyRoom/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll

	NotInMyRoom/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	NotInMyRoom/Library/ScriptAssemblies/Assembly-UnityScript.dll
	NotInMyRoom/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	NotInMyRoom/Library/ScriptMapper
	NotInMyRoom/Library/assetDatabase3
	NotInMyRoom/Library/expandedItems
	NotInMyRoom/Library/guidmapper
	NotInMyRoom/Library/metadata/a0/a007cbfd70995ae4e82afb70b254982e
	NotInMyRoom/Library/metadata/a3/a366ce9c96b70f84092d96f53557c91d
	NotInMyRoom/Library/metadata/ed/edb1c3bd89a450a4891137b0dead1c2c
	NotInMyRoom/Library/metadata/f5/f5ff753f2469e2840a68ec6ca1b441d7
	NotInMyRoom/NotInMyRoom.userprefs