Attempt #`
Merge remote-tracking branch 'ShelemGame/master'

Conflicts:
	Shelem/src/ImageRegistry.java