kellys hello to mark
Merge branch 'master' into Kelly
Merge branch ‘Adam’ into Kelly
-main class
Merge branch 'Kelly'
UI_Iteration_2

-Removed Media Buttons
-Removed Doc Header
-Added Frame Display
-Added Multi-Purpose ColorWheel
working model-contains adams code
added the component mover and set layout to canvas that adam is working

with
Merge branch 'Kelly'
Merge branch 'master' into Adam

Conflicts:
	Pantimator/src/pantimator/Canvas.java
	Pantimator/src/pantimator/Drawable.java
	Pantimator/src/pantimator/Paintimator.java