Merge branch 'master' of https://github.com/mflorence99/pi-ware

Conflicts:
	data/sources/products.xlsx
Merge branch 'master' of https://github.com/mflorence99/pi-ware

Conflicts:
	data/sources/products.xlsx