update
update
Merge branch 'master' of https://github.com/astropeat/FoothillCS

Conflicts:
	CS Group Project/CS Group Project/ProductDatabase.cpp
	CS Group Project/CS Group Project/ProductDatabase.h
Merge branch 'master' of https://github.com/astropeat/FoothillCS

Conflicts:
	CS Group Project/CS Group Project/ProductDatabase.cpp
	CS Group Project/CS Group Project/ProductDatabase.h