rad
-f
Merge branch 'master' of github.com:mgsloan/testrepo

Conflicts:
	foo.txt
foo
del
Merge branch 'master' of github.com:mgsloan/testrepo
gooo
Merge branch 'master' of github.com:mgsloan/testrepo

Conflicts:
	foo.txt