ajuste
Merge branch 'master' of https://github.com/jonatascastro12/flightMonitor

Conflicts:
	flightMonitor/settings.py