Started hitbox logic, added item flickering
Updated falling
Merge branch 'master' of https://github.com/balstar5283/Fighter into characterdev

Conflicts:
	Assets/Scenes/FightScene.unity
Added attack hitboxes again
Merge branch 'characterdev' of https://github.com/balstar5283/Fighter