finalizing
finalizing
finalizing
Merge remote-tracking branch 'origin/doodle' into doodle

Conflicts:
	src/ShootingGallery.java
Final