minor updates
Merge branch 'master' of https://github.com/patkaehuaea/UWBothell_CSS503_AS2

Conflicts:
	UWBothell_CSS503_AS2/Shop.cpp
	UWBothell_CSS503_AS2/Shop.h