Adding client fix
Merged fix
Generating conflict
Merge branch 'master' of https://github.com/DoctorJG/hellogitworld

Conflicts:
	fix.txt