Tool Panel work
Merge branch 'Jeremy' into Kelly

Conflicts:
	Pantimator/src/pantimator/Paintimator.java
	Pantimator/src/pantimator/ToolPanel.java
contains tool panel and animation panel
Merge branch 'Kelly'
small fixes to sizes of buttons
Merge branch 'Kelly'
small fixes
small fixes
small fixes
Merge branch 'master' into Kelly
may have broke my branch f intellij
Merge remote-tracking branch 'origin/Kelly' into Jeremy

Conflicts:
	Pantimator/src/pantimator/Paintimator.java
Updates