Bla
Merge branch 'master' of https://github.com/Bulten/project-titanic into Bulten-master

Conflicts:
	src/sv/project_titanic/Controller.java
	src/sv/project_titanic/model/Ship.java
Fix merge