comment on same line to cause merging problem
Merge branch 'master' of https://github.com/robertomalagigi/git-spike

Conflicts:
	my-first-scala-project/src/main/scala/org/binqua/scala/examples/general/HelloWorld.scala