Added test of json serialisation
Merge branch 'master' of github.com:PressRedXP/backend

Conflicts:
	src/main/java/People.java