Committing before pull
Merge branch 'master' of https://github.com/ydubale/414A2

Conflicts:
	src/Controllers/Order.java

GUI works and can add items to an order, remove items or cancel an order.

Add cc validation
Made it so guest didn't have to enter credentials
Implemented the changeUI and cash payments
Merge branch 'master' of https://github.com/ydubale/414A2

Conflicts:
	src/Controllers/Order.java

GUI works and can add items to an order, remove items or cancel an order.

Add cc validation
Made it so guest didn't have to enter credentials
Implemented the changeUI and cash payments
Merge remote-tracking branch 'origin/master' into UI_test_branch

Conflicts:
	src/UI/ChangeMakerUI.java
	src/UI/CreateAccountUI.java
	src/UI/CustLogin.java
	src/UI/MainMenu.java
	src/UI/ProductDesc.java
	src/UI/chefUI.java
	src/UI/editItemUI.java
	src/UI/paymentUI.java
Ultra merge :)
ZH