added links to our thumbnails
Merge branch 'master' into chart
styled makeup show page
styled makeup page
fixing merge conflicts
fixed merge conflicts
Merge pull request #30 from zelzel2315/reviews

pushing up last changes
sprockets
changed user show page
Merge pull request #26 from zelzel2315/chart

Chart
trying to add angular to makeups index