circle was accidentally using the background color
deleted some comments
Merge branch 'master' into Kelly

Conflicts:
	Pantimator/src/pantimator/Canvas.java
	Pantimator/src/pantimator/Listener.java
merge fixes
Recommit

Accidently commited to master, recommiting to my branch
Fixing this branch

Trying to fix my branch. Save and loading added, for now.
Commit

stuff
Merge branch 'Pres' into Kelly
updating
Merge branch 'Pres' into Kelly

Conflicts:
	Pantimator/bin/.gitignore
	Pantimator/src/pantimator/LayeredPanel.java
	Pantimator/src/pantimator/Listener.java
	Pantimator/src/pantimator/Paintimator.java
	Pantimator/src/pantimator/ShapeWrapper.java
conflict fixes
fixes
fixes
Merge branch 'master' into Kelly

Conflicts:
	Pantimator/src/pantimator/Drawable.java
	Pantimator/src/pantimator/LayeredPanel.java
	Pantimator/src/pantimator/LayeredPanelList.java
	Pantimator/src/pantimator/Paintimator.java
	Pantimator/src/pantimator/ShapeWrapper.java
merge
fixes
new class for tool panel for better flowing code
the layered panel class no longer accesses the listener class’s state
Annoyed
Merge remote-tracking branch 'origin/Kelly' into Jeremy

Conflicts:
	.idea/misc.xml
	.idea/vcs.xml
	.idea/workspace.xml
	Pantimator/Pantimator.iml
	Pantimator/src/pantimator/ImageFilter.java
	Pantimator/src/pantimator/LayeredPanel.java
	Pantimator/src/pantimator/Listener.java
	Pantimator/src/pantimator/Paintimator.java
	Pantimator/src/pantimator/ShapeWrapper.java
	out/production/Pantimator/pantimator/ComponentMover.class
	out/production/Pantimator/pantimator/DragLayout.class
	out/production/Pantimator/pantimator/Drawable$ShapeType.class
	out/production/Pantimator/pantimator/Drawable.class
	out/production/Pantimator/pantimator/ImageFilter.class
	out/production/Pantimator/pantimator/LayeredPanel$Layer.class
	out/production/Pantimator/pantimator/LayeredPanel.class
	out/production/Pantimator/pantimator/Listener$1.class
	out/production/Pantimator/pantimator/Listener$LisState$1.class
	out/production/Pantimator/pantimator/Listener$LisState$2.class
	out/production/Pantimator/pantimator/Listener$LisState$3.class
	out/production/Pantimator/pantimator/Listener$LisState$4.class
	out/production/Pantimator/pantimator/Listener$LisState$5.class
	out/production/Pantimator/pantimator/Listener$LisState$6.class
	out/production/Pantimator/pantimator/Listener$LisState$7.class
	out/production/Pantimator/pantimator/Listener$LisState.class
	out/production/Pantimator/pantimator/Listener.class
	out/production/Pantimator/pantimator/Paintimator$1.class
	out/production/Pantimator/pantimator/Paintimator$10.class
	out/production/Pantimator/pantimator/Paintimator$11.class
	out/production/Pantimator/pantimator/Paintimator$12.class
	out/production/Pantimator/pantimator/Paintimator$2.class
	out/production/Pantimator/pantimator/Paintimator$3.class
	out/production/Pantimator/pantimator/Paintimator$4.class
	out/production/Pantimator/pantimator/Paintimator$5.class
	out/production/Pantimator/pantimator/Paintimator$6.class
	out/production/Pantimator/pantimator/Paintimator$7.class
	out/production/Pantimator/pantimator/Paintimator$8.class
	out/production/Pantimator/pantimator/Paintimator$9.class
	out/production/Pantimator/pantimator/Paintimator.class
	out/production/Pantimator/pantimator/ShapeWrapper.class
	out/production/Pantimator/pantimator/Utils.class
fixy mcfixerton