adding in masonry
Merge branch 'master' of https://github.com/jjcody/showroom
Merge branch 'master' of https://github.com/jjcody/showroom
correcting issue with factories
fixing factories and conflicts on index page