...

...
....

....
gitnore
Merge branch 'Kelly' into Jeremy

Conflicts:
	Pantimator/bin/pantimator/Paintimator.class
	Pantimator/src/pantimator/AnimationPane.java
	Pantimator/src/pantimator/Paintimator.java
merge
123
Merge branch 'Jeremy' into Kelly

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