new details, buses stuff
starting to implement buses and trains
Merge remote-tracking branch 'origin/sumayyah' into joey

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

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