Updated product description
changed foo back and old foo to Bar:
edit 1
 test 1
Merge branch 'staging'

Conflicts:
	index.html
test2
Merge branch 'staging'
fix