added categories page
styled the categories page
products page
feature 1
added link to feature 1
added feature 2
added link to feature 2
Merge branch 'feature1'
fix home conflict