Commiting so Liz can help.
Shape button working again
Merge remote-tracking branch 'origin/redoAddShape'

Conflicts:
	src/foldr/main/GUI.java