Delete a method
deleted some method
Merge branch 'oneTest'
Merge branch 'twoTest'

Conflicts:
	Airline/src/controller/LogicClass.java