Added a new class to handle the color chooser wheel.
Merge branch 'Kelly'
Merge branch 'Kelly'
Merge branch 'Kelly'
Merge branch 'Kelly'
Merge branch 'Kelly'
Merge branch 'Kelly'
Merge branch 'master' of https://github.com/CSC420/Paintimator
Merge branch 'Kelly'
updated animation pane
Merge branch 'Kelly'

Conflicts:
	Pantimator/bin/pantimator/Listener$LisState$1.class
	Pantimator/bin/pantimator/Listener$LisState$3.class
	Pantimator/bin/pantimator/Listener$LisState$6.class
	Pantimator/src/pantimator/AnimationPane.java
ugh why are the classes back on github
Merge branch 'Kelly'

Conflicts:
	.idea/workspace.xml
	Pantimator/bin/pantimator/LayeredPanel$Layer.class
	Pantimator/bin/pantimator/LayeredPanel.class
	Pantimator/bin/pantimator/Listener$LisState$1.class
	Pantimator/bin/pantimator/Listener$LisState$2.class
	Pantimator/bin/pantimator/Listener$LisState$3.class
	Pantimator/bin/pantimator/Listener$LisState$6.class
	Pantimator/bin/pantimator/Listener$LisState$7.class
	Pantimator/bin/pantimator/Listener$LisState.class
	Pantimator/bin/pantimator/Listener.class
	Pantimator/bin/pantimator/Paintimator.class
	Pantimator/src/pantimator/AnimationPane.java
	Pantimator/src/pantimator/ColorWheelPanel.java
	Pantimator/src/pantimator/Listener.java
	Pantimator/src/pantimator/OptionsPanel.java
	Pantimator/src/pantimator/Paintimator.java
	Pantimator/src/pantimator/ToolPanel.java
master is up to date
master is more up to date
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pantimator/images/color_wheel.png
	Pantimator/src/pantimator/ToolPanel.java
Adam - Fixed Thumb class so each animation thumbnail is unique...
Merge branch 'master' into Kelly

Conflicts:
	Pantimator/bin/pantimator/Paintimator.class
	Pantimator/images/eraser.png
	Pantimator/src/pantimator/Paintimator.java