corregir error
Merge branch 'master' of https://github.com/proyectosuia/Aerolineas

Conflicts:
	Aerolineas.suo
Merge branch 'master' of https://github.com/proyectosuia/Aerolineas

Conflicts:
	Aerolineas.suo