Merge branch 'pr/6' into release (Galaga.java only)

Conflicts:
	bin/Galaga/Galaga.class
	src/Galaga/Galaga.java