Added checkout page
Added link to checkout page
Added new links to the home page
Merge branch 'add_home_page_links'
Merge branch 'checkout_page'

Conflicts:
	home.htm
Changed the home page links:
Added feature1
Merge branch 'feature1'
Added feature2
Merge branch 'feature2'
Added feature3
Added link to feature 3
Reverting feature 3 from master
Added feature 3
Added link to feature 3
Merge branch 'feature3'
Added feature 4
Added link to feature 4
Merge branch 'feature4'
Added home page