Test 9
Merge branch 'master' of https://github.com/organization98/jsonproject

Conflicts:
	JSONProject/testFile.txt

Merge file is ok