#23 Reconstruindo o projeto e os adequando.
Merge branch 'master' of
https://github.com/lucasmonteiro001/IntSystems-Project2.git

Conflicts:
	AirTickets_Web_2.0/WebContent/WEB-INF/web.xml