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

Conflicts:
	src/ShootingGallery.java
Merge remote-tracking branch 'origin/doodle' into doodle