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

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

Conflicts:
	CS Group Project/CS Group Project/Account.cpp
	CS Group Project/CS Group Project/Product.cpp