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

Conflicts:
	CS Group Project/CS Group
Project.xcodeproj/project.xcworkspace/xcuserdata/kbugyi.xcuserdatad/User
InterfaceState.xcuserstate
	CS Group Project/CS Group Project/Account.h
	CS Group Project/CS Group Project/IOMSapp.cpp
	CS Group Project/CS Group Project/Order.cpp
	CS Group Project/CS Group Project/ProductDatabase.cpp
Merge branch 'master' of https://github.com/astropeat/FoothillCS

Conflicts:
	CS Group Project/CS Group
Project.xcodeproj/project.xcworkspace/xcuserdata/parente_jose.xcuserdata
d/UserInterfaceState.xcuserstate
	CS Group Project/CS Group Project/Account.h