Merge remote-tracking branch 'origin/master' into Dan-Branch
MASTER COMMIT HERE

Collision Broken added
Changes
MOAR ASSETS? OKAY HERE

U WANTED MOAR SO HERE THEY ARE
Merge remote-tracking branch 'origin/Dan-Branch'
GOTTA GET DEM DIAMONDS

ROCKS ON ROCK ON ROCKS
Collision Added
Merge branch 'Dan-Branch'
wow finally got it up after second do thing
BULLET STUFFZ

directional sprite chang3s
I Broke Everything Just Kidding I Fixed Conflicts Yay