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

Conflicts:
	.idea/workspace.xml
	Pantimator/Pantimator.iml
Fixed the triangle tool!!
fixes
Merge remote-tracking branch 'origin/master'
Added tool options panel
added tool options panel
updates
one random fix
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'