Merge branch 'master' into Adam

Conflicts:
	Pantimator/src/pantimator/Canvas.java
	Pantimator/src/pantimator/Drawable.java
	Pantimator/src/pantimator/Paintimator.java
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...
trying to fix things so I can merge with master...
Merge branch 'Adam'

Conflicts:
	Pantimator/Pantimator.iml
	Pantimator/src/pantimator/LayeredPanel.java
	Pantimator/src/pantimator/ShapeWrapper.java