init code review
review
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/java/main/com/bravofly/exercise/main/Flight.java
	src/java/test/com/bravofly/exercise/main/RoutesTest.java
new comments