working on ticketFlight-test, created object dependencies now working on integrating flight class
Merge remote-tracking branch 'origin/master'

Conflicts:
	php/transaction.php