-resolving conflict
Merge branch 'master' of https://github.com/dlhextall/gti525-ticketz.git

Conflicts:
	spring-mvc/src/main/java/ca/etsmtl/ticketz/data/ShowBank.java