images rendering in individual makeup show page
added images to makeups
changed makeup controller
edited files for merging
Merge pull request #17 from zelzel2315/addimages

Addimages
added link in nav