We've got some smokin' html here.
Our CSS is da bomb
HTML
We got css too
Merge branch 'about_us'. QA has signed-off on this.
Merge branch 'contact_us'. QA approved in ticket 123.
Redesigned home page per ticket 23
New search functionality
Adding search functionality to home page.
Merge branch 'home_page_redesign'
Merge branch 'search'

Conflicts:
	index.html

Search functionality was added in a way that conflicted with new home page redesign.
Feature1.html
feature1 link on home page
feature2.html
Adding feature2 link to home page
Merge branch 'feature1'
Merge branch 'feature2'

Conflicts:
	index.html