commit products

should be granular!??!?!? but isnt
Merge branch 'master' into products

Conflicts:
	index.html
Merge pull request #1 from azdavis/products

merge products into master