more refactoring
Merge branch 'master' of github.com:wipxj3/EventTicket
update