Changed File1.txt
Add a lile to User2File1.txt
Merge branch 'master' of https://github.com/gdunnjr/GitHubDemo

Conflicts:
	Folder1/File1.txt
	Folder1/User2File1.txt