finished version
Merge branch 'Program' of https://github.com/gpoppi/Group-Project into Program

Conflicts:
	Program/Parts/payment_ticket.py
Merge branch 'Program' of https://github.com/gpoppi/Group-Project into Program