Changing Orders to Order
.
Merge branch 'master' of https://github.com/puluceno/comp433

Conflicts:
	src/main/java/edu/luc/comp433/dao/OrderDAO.java
.