milk
Merge branch 'Kelly'
accidentally was on master
did this fix it? sorry guys
Adam - Added ability to play animations from animation panel, plus a few other minor tweaks...
Merge branch 'master' into Kelly

Conflicts:
	Pantimator/src/pantimator/AnimationPane.java
	Pantimator/src/pantimator/Paintimator.java
	Pantimator/src/pantimator/ToolPanel.java
	Pantimator/src/pantimator/images/whiteDraw.png