added link to return to user profile in nav
added link in nav
attempting to merge changes
added images
added rest of images
added links to our thumbnails
Merge pull request #23 from zelzel2315/addimages

Addimages
Merge branch 'master' into chart
making more styling changes
fixing rspec files
trying to fix merge conflicts
Merge pull request #24 from zelzel2315/collections

Collections
styled makeup show page
styled makeup page
users can add new makeups to their collection
Merge pull request #25 from zelzel2315/collections

users can add new makeups to their collection
fixing merge conflicts
fixed merge conflicts
when users make new makeup it is now added on makeup index
Merge pull request #28 from zelzel2315/collections

when users make new makeup it is now added on makeup index