somehow intelliJ broke my branch “Kelly” so this is my new branch
small fixes
small fixes
Merge branch 'Jeremy' into Kelly2

Conflicts:
	Pantimator/bin/pantimator/LayeredPanel$Layer.class
	Pantimator/bin/pantimator/LayeredPanel.class
	Pantimator/bin/pantimator/Paintimator.class
	Pantimator/src/pantimator/LayeredPanel.java
	Pantimator/src/pantimator/Paintimator.java
confict fixes
small updates
Can use a background image now
gitignore updates
trying to get to work with multiple screens
added line size and color selector
added line size and color selector
fixes
Added tool options panel
added tool options panel
updates
one random fix
Merge branch 'Kelly' into Jeremy

Conflicts:
	Pantimator/bin/pantimator/Paintimator.class
	Pantimator/src/pantimator/AnimationPane.java
	Pantimator/src/pantimator/Paintimator.java