client side change
Merge branch 'master' of https://github.com/rszero/hellogitworld

Conflicts:
	fix.txt
local changes
changes
Merge branch 'master' of https://github.com/rszero/hellogitworld

Conflicts:
	fix.txt