json fixed error
Merge branch 'master' of github.com:khaperets/tp into alex