This is a test commit
testing commit with -m
Add a second line
This is another test commit
Merge branch 'master' of https://github.com/cboudreauSF/bc-git-practice

Conflicts:
	newfile.txt