makeup json
changed user show
fixed merge conflict
edited seed
edited user controller
added nested attributes
Merge pull request #14 from zelzel2315/makeupjson

added nested attributes