Adam - Attempting a repush of changes....
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pantimator/src/pantimator/Paintimator.java
Adam - Attempting to fix push....