DZ2.6
Merge branch 'master' of https://github.com/fairk19/java

Conflicts:
	Shooter/.idea/modules.xml
	Shooter/.idea/workspace.xml