Combat is now combat.

Combat is fixed more than ever before, fixed invisible walls not
resetting bug, made rolling more effective.
Merge branch '2D_branchV2' of https://github.com/JordanStone/CS345BeatEmUp into 2D_branchV2

Conflicts:
	Assets/Scenes/SceneOne.unity