another comment from fork
yet another comment before 3rd and 4th comment from master
Merge remote-tracking branch 'upstream/master'

Conflicts:
	scala-hack-session-1/src/main/scala/Test.scala