moved some stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/me/drewhoener/compsci/plainclass/shapes/Rectangle.java