Adding some conflicting text
Merge branch 'master' of https://github.com/vmalarcon/scala99

Conflicts:
	merge.txt