I havent done anything
Merge branch 'master' of https://github.com/mcdon00/NSCC-Game-Jam
i did nothing
Merge branch 'master' of https://github.com/mcdon00/NSCC-Game-Jam
i did literally nothing
fixed conflicts
did collision detection