commit pre-update(resolving conflict)
Merge branch 'master' of https://github.com/dlhextall/gti525-ticketz.git
-invoice completed