Got particle<->block collisions in place
Fixed merge conflicts?
Finally getting that collision in. Had to fix merge conflicts and im not sure if im supposed to commit after every merge conflict resolution but im doing it anyway