Day 2 player collision with some objects
Fixed merge conflicts with Day 3 stuff
Fixed the REAL merge conflict
collides with objects, but stops
Got as much as I could done
Fixed spelling, merge conflict