new feature
Merge branch 'master' of https://github.com/dmgit68/json_proj.git

Conflicts:
	toto1.txt
Merge branch 'master' of https://github.com/dmgit68/json_proj.git