added json serializer
Merge pull request #10 from zelzel2315/makeupjson

added json serializer