updating updates
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
small fixes
Updates
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
Merge branch 'Kelly2'