spikes added
Merge branch 'master' of https://github.com/dyxh/cs220

Conflicts:
	Platformer/Source/Platformer/PaperPlatformerCharacter.h
Merge branch 'master' of https://github.com/dyxh/cs220

Conflicts:
	Platformer/Source/Platformer/PaperPlatformerCharacter.h