Branching attempt
product, menu, and some changes on css
more ...
n
Merge branch 'b1'

Conflicts:
	_work/.DS_Store
	_work/Menu.html
	_work/OurStory.html
	_work/StaticTemplate.html
	_work/branding.css
Merge branch 'origin/master'