made a change
Merge branch 'origin/Dan'
Merge branch 'origin/master'

Conflicts:
	Text Doc.txt