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

Conflicts:
	CarbonFlights/src/main/java/edu/davis/carbonflights/DetailActivity.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/Flight.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/MainActivity.java

CarbonFlights/src/main/java/edu/davis/carbonflights/ResultsActivity.java