Merge branch 'Joev2'
COMMIT TA CHANGES!!!!!!!!!!!!!!!!!!  BLAAAAARRRRGGGGHHHHUHJK#BNRWBG#UWFJNK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
COMMIT TA CHANGES!!!!!!!!!!!!!!!!!!  BLAAAAARRRRGGGGHHHHUHJK#BNRWBG#UWFJNK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Merge branch 'Joev2'
Merge branch 'master' of https://github.com/Sigma-Delta-Blah/PlatformerJoy