Fixed overloading addMinutes()
Merge branch 'Tom'

Conflicts:
	airport.cpp