added scenario 5
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/java/test/com/bravofly/exercise/main/TravelTimeTest.java