some 2d shapes
Merge branch 'master' of github.com:OpenMods/OpenBlocks

Conflicts:
	src/jadedladder/shapes/ShapeFactory.java
dropblock
Merge pull request #2 from mikeemoo/master

Drop block