Adding new file to source control, newfile.txt
change it
changes added
merged
Merge branch 'master' of
https://github.com/cboudreauSF/bc-git-practice.git

Conflicts:
	newfile.txt
Merge branch 'master' of https://github.com/cboudreauSF/bc-git-practice.git
Merge branch 'master' of https://github.com/cboudreauSF/bc-git-practice