Merge branch 'tidying_up' of https://github.com/jjcody/showroom into tidying_up
pulling malibu's branch to spruce up the items#show page for individual items, such as adding the array of images
added hearts pics
Merge branch 'master' of https://github.com/jjcody/showroom into tidying_up
ng in master