test 6
test 7
test 8
Merge branch 'master' of https://github.com/cloudhc/ScalaTravel.git

Conflicts:
	src/HelloScalaApp.scala