still testing
Highlighting and bringing a shape to the front now work
wat
fixed a fuckup
Created the Trapezoid shape class
fixed indentations
Merge branch 'master' of https://github.com/kjanssen/ShapesAndShit

Conflicts:
	Shape.java
	ShapeDialog.java