Fixed again...

FIXED
Merge branch 'In-Line' of https://github.com/supercclank/CS2340 into In-Line

Conflicts:
	JsonStructure.txt
json fix

fixed