Scott said I had to
Merge branch 'master' of https://github.com/tjhouston/rmw

Conflicts:
	client/products/products.html