Local changes made
Merge branch 'master' of github.com:bbengfort/demo

Conflicts:
	myfile.txt