Renamed home page.
Added contact.html
Merge branch 'contactus'
Added search.html
Styled search
Added categories.html
Styled categories
Merge branch 'categories'
Merge branch 'search'
Added myaccount.html
Added link to myaccount page in the home page
Redesigned home page
Merge branch 'myaccount'
Merge branch 'homepage_redesign'

Conflicts:
	home.htm
Added feature 1 page
Styled feature 1
Merge branch 'feature1'
Added feature 2 page
Styled feature 2
Merge branch 'feature2'