test
Merge branch 'master' of https://github.com/krohit/ShootingGallerye branch 'master' of https://github.com/krohit/ShootingGallery

Conflicts:
	.project
	bin/Main.class