Minor changes to Add order
Merge branch 'master' of https://github.com/TheProjectBuddy/POSofG

Conflicts:

Android/PizzaOrderingSystemClient/bin/classes/cs/colostate/cs414/a5/g/pi
zzaorderingsystemclient/OrderActivity.class

Android/PizzaOrderingSystemClient/src/cs/colostate/cs414/a5/g/pizzaorder
ingsystemclient/OrderActivity.java

Android/PizzaOrderingSystemServer/bin/cs/colostate/cs414/a5/g/controller
/OrderController.class

Android/PizzaOrderingSystemServer/src/cs/colostate/cs414/a5/g/controller
/OrderController.java