Merge branch 'Kelly'
UI_Iteration_2

-Removed Media Buttons
-Removed Doc Header
-Added Frame Display
-Added Multi-Purpose ColorWheel
Added a bit of functionality throughout, but still some math left to do with triangle and rectangle
Merge branch 'Kelly'
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.
Merge branch 'master' into Kelly

Conflicts:
	Pantimator/src/pantimator/Canvas.java
	Pantimator/src/pantimator/Listener.java