fix.txt changed
second change
prep for merge
Master conflicting
Feature branch conflicting RED
Merge branch 'master' into duncwafeature

Conflicts:
	README.txt
Merge branch 'duncwafeature' of https://github.com/duncwa/hellogitworld into duncwafeature

Conflicts:
	README.md