beach and bedrock
beach and bedrock

Conflicts:

	mce.py

mcedit/pymclevel,arruda/pymclevel,codewarrior0/pymclevel,mcedit/pymclevel,codewarrior0/pymclevel,ahh2131/mchisel,arruda/pymclevel,ahh2131/mchisel