.
Merge branch 'master' of https://github.com/puluceno/project3

Conflicts:
	project3/src/main/java/edu/luc/comp433/service/PaymentService.java
.