Adding about.html
adding css
Adding contact
dding contact.css
Merge branch 'about_us'
Merging contact_us into master
Redesigned home page
Added search page
Added link to search page
Blah
Merge branch 'home_page_redesign'
Merge branch 'search'

Conflicts:
	index.html - Merged changes from search and home page redesign
Adding it in
Added link to index page for feature 1
Added feature 2
Added link to feature 2
Merge branch 'feature1'
Merge branch 'feature2'

Conflicts:
	index.html