bye
restoring deleted file
Merge branch 'master' of ssh://github.com/hmackiernan/example
Merge branch 'master' of ssh://github.com/hmackiernan/example

Conflicts:
	one.txt