master merging
Merge branch 'master' of https://github.com/joeyjiron06/CarbonFlights

Conflicts:

CarbonFlights/src/main/java/edu/davis/carbonflights/activity/ResultsActi
vity.java