added link to return to user profile in nav
added link in nav
attempting to merge changes
styled landing page
homepage styling completed
merging with the master
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 users show page
styled makeup show page
styling for user show page
styled users show page, needs to merge with master
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