working on json to obj converter
Merge branch 'master' of https://github.com/EclairBristol/playfulgallerymaster
Merging