Solving Minor Errors
Merge branch 'AppForCommandLine' of
https://github.com/Lucas-Andrade/Grupo-3-EHL.git into AppForCommandLine

Conflicts:
	src/airtrafficcontrol/app/appforcommandline/AirCorridor.java
	src/airtrafficcontrol/app/appforcommandline/InMemoryDatabase.java
	src/airtrafficcontrol/app/appforcommandline/User.java