testing featured products
testing featured products
testing home page
Merge branch 'master' of github.com:tommyadey/aries
fixing conflicts