Merge pull request #1 from zelzel2315/makeups

edited more CRUD functions
Merge pull request #2 from zelzel2315/makeups

added proper relationships to user makeup model
Merge pull request #3 from zelzel2315/makeups

added seed data
Merge pull request #4 from zelzel2315/makeups

Makeups
edited user controller
edited user controller
Merge pull request #5 from zelzel2315/makeups

fixing relationships between user and makeup
changed makeup controller
makeup index change
Merge pull request #6 from zelzel2315/controller

makeup index change
Merge pull request #7 from zelzel2315/makeups

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

fixed sign up problems
Merge pull request #9 from zelzel2315/makeups

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

added json serializer
can display user makeup in show