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'
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.
Merge branch 'Adam' into Kelly

Conflicts:
	Pantimator/src/pantimator/ToolPanel.java