test 12 added
Merge branch 'master' of https://github.com/organization98/jsonproject

Conflicts:
	JSONProject/testFileTwo.txt

file merged