foo added
Merge branch 'master' of https://github.com/renney/RemoteGitHubTest

Conflicts:
	foo.txt