pushing changes to get anabel to sign up
Merge pull request #7 from zelzel2315/makeups

pushing changes to get anabel to sign up
fixed sign up problems
Merge pull request #8 from zelzel2315/makeups

fixed sign up problems
changes in user new
Merge pull request #9 from zelzel2315/makeups

changes in user new
Merge pull request #10 from zelzel2315/makeupjson

added json serializer
makeup json
can display user makeup in show
Merge pull request #12 from zelzel2315/makeups

can display user makeup in show
changed user show
fixed merge conflict
trying to add a foreign key
edited seed
Merge pull request #13 from zelzel2315/makeups

trying to add a foreign key
edited user controller
added nested attributes