Yeah
Merge branch 'master' of ssh://github.com/RickyOak/test

Conflicts:
	foo.txt