Nathan adding a line to brienfile.txt
Merge branch 'master' of https://github.com/solutiondesign/getting-git

Conflicts:
	brienfile.txt