json library
Merge branch 'master' of https://github.com/ssamot/vgdl_competition

Conflicts:
	src/clients/java/Agent.java