added commit 2
added commit 2
Merge remote-tracking branch 'master/master'

Conflicts:
	src/HelloScalaApp.scala