a commit
Not actual commit
Merge branch 'master' of https://github.com/zohelfer/CS414v1

Conflicts:
	CUSTOMER
	INCOMPLETE
	LOGIN
Tried to fix submitOrder()
Merge branch 'master' of https://github.com/zohelfer/CS414v1

Conflicts:
	PizzaSystem/src/Contollers/OrderController.java