Merge branch 'master' of /Users/sobolevstp/IdeaProjects/Sea-Battle with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Amboss/src/app/model/Field.java
	SergeyYevsyukov/src/app/model/Ship.java
add shot logic
Merge remote-tracking branch 'origin/master'