creating model of Ship and Cell
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main/src/net/amboss/TestClass.java
creating model of Ship and Cell