described Merlin
Merge branch 'master' of https://github.com/rsg2123/swc_test_repo
dealt with conflicts - the great is...
Conflicts:
	sillycatnames.txt