Change
changes
test case
New test files
Merge branch 'master' of https://github.com/jamespitts/JamesPitts

Conflicts:
	Coder/object1.json
	Coder/test.cpp

Conflicts