Sam was here
Merge branch 'feature' of github.com:GiacoPalma/AlmhultFlyg into feature

Conflicts:
	src/Airport.java
	src/Flight.java