Merge branch 'Kelly2'
small fixes
Resetting my branch...
Merge branch 'Kelly2'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	Pantimator/Pantimator.iml
Fixed the triangle tool!!
Merge branch 'Kelly'
line size
Merge remote-tracking branch 'origin/master'
Animation Update

Animation Panel update. Made thumbnails larger
Added functionality for dynamically changing the cursor over the canvas, as well as initial functionality for holding shift while drawing to make straight lines.
Added method to layered panel to clear everything.
random
Merge branch 'Adam' into Kelly

Conflicts:
	Pantimator/src/pantimator/ToolPanel.java
merged adams branch into mine
added lukes background image
Merge branch 'Kelly'
added adams color wheel to the ColorWheelPanel class
Merge branch 'Kelly'
added background image, tried to spice up animation pane(needs work)
Merge branch 'Kelly'