Merge remote-tracking branch 'origin/master'

Conflicts:
	Pantimator/src/pantimator/Canvas.java
	Pantimator/src/pantimator/Drawable.java
	Pantimator/src/pantimator/Paintimator.java
Implemented a LayeredPanel to allow for drawing on a "glass pane", or a jpanel on top of the main canvas. Partial functionality for lines and free-draw.
Implemented a LayeredPanel to allow for drawing on a "glass pane", or a jpanel on top of the main canvas. Partial functionality for lines and free-draw.
Many changes, most of the tools working, still working on adding text
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
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