add test2 function
Merge branch 'master' of https://github.com/cloudhc/ScalaTravel.git

Conflicts:
	src/HelloScalaApp.scala