test
Merge branch 'master' of https://github.com/dlhextall/gti525-ticketz

Conflicts:

	spring-mvc/src/main/java/ca/etsmtl/ticketz/controller/CheckoutController.java