.
Merge branch 'master' of https://github.com/dyxh/cs220
super jank implementation of attack animation working -- sensical hitbox and hurtboxes added -- changed the map a little to not be trivial
fixed bugs: 1) attack feels more reflexive now and responsive to when the animation is actually going 2) stamina regenerates correctly
Merge branch 'master' of https://github.com/dyxh/cs220

Conflicts:
	Platformer/Source/Platformer/PaperPlatformerCharacter.cpp