line 555small
kjhkjh
line 7777777777777
Merge branch 'master' of https://github.com/smphouse/test

Conflicts:
	testMerge.txt