Merge pull request #24 from zelzel2315/collections

Collections
users can add new makeups to their collection