Added boundaries to the world so you can't fall off the edge
Resolved merge conflicts