Made change to flight agent
Merge branch 'master' of git@github.com:Jency/intelligentAgent.git

Conflicts:
	TACAgent/se/sics/tac/agent/FlightAgent.java