miniändring
Merge remote-tracking branch 'origin/master'

Conflicts:
	Workshop 2/src/Model/BoatDAL.php