Added cave generation and a new way of creating blocks
Fixed merge conflicts