JSON Logic

xml file added
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/client/JSONTemplate.java