added link to return to user profile in nav
added link in nav
attempting to merge changes
making more styling changes
fixing rspec files
trying to fix merge conflicts
Merge pull request #24 from zelzel2315/collections

Collections
styled makeup page
fixing merge conflicts