Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
changes
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
Finishing up