edit terrain generator
Merge branch 'master' of https://github.com/cheapbrain/VoxelGame

Conflicts:
	src/net/cheapbrain/voxel/GameState.java