Adding new files
changing stuff
testing a push
Merge branch 'master' of https://github.com/cboudreauSF/bc-git-practice

Conflicts:
	newfile.txt