iteration 2 bis next
Merge branch 'master' of https://github.com/szczepiq/cbe

Conflicts:
	team5/src/main/java/Flight.java