Merge branch 'master' into Adam

Conflicts:
	Pantimator/src/pantimator/Canvas.java
	Pantimator/src/pantimator/Drawable.java
	Pantimator/src/pantimator/Paintimator.java
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
Many changes, most of the tools working, still working on adding text
merge fixes
Jeremy - Added some small stuff; Load and Save items to menu, can load an image and draw on it, added two new classes to help filter image files
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
Merged with master, complete with all my latest updates.
Fixed the text tool - it works now!!
Merge remote-tracking branch 'origin/Adam'

Conflicts:
	Pantimator/src/pantimator/Canvas.java
	Pantimator/src/pantimator/Drawable.java
	Pantimator/src/pantimator/Paintimator.java
Changed the way erase works - added undo and redo functionality!!!!
Added some magic...
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
Merge remote-tracking branch 'origin/Pres'

Conflicts:
	Pantimator/src/pantimator/Paintimator.java
	Pantimator/src/pantimator/ShapeWrapper.java