local change to dan.txt
Merge branch 'master' of https://github.com/djarnold/hellogitworld
Local Change
Merge branch 'master' of https://github.com/djarnold/hellogitworld

Conflicts:
	fixrenamed.txt