Added allProducts and slideshow to index
Merge branch 'Rebuilt_Site' of git://github.com/pattyok/modernist_cat into Rebuilt_Site
Merge branch 'Rebuilt_Site' of git://github.com/pattyok/modernist_cat into Rebuilt_Site

Conflicts:
	js/app.js
Merge pull request #2 from ozten/Rebuilt_Site

Added allProducts and slideshow to index