Something
Merge branch 'master' of ssh://github.com/johanfranzen/TestRepo

Conflicts:
	README.md
Merge branch 'master' into mybranch

Conflicts:
	README.md