implementd onclick listener in result activity
Merge remote-tracking branch 'origin/sumayyah' into joey
i thought i pushed this
stuff
new details, buses stuff
network stuff
starting to implement buses and trains
Merge branch 'master' 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
pre merging
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
added sliding menu
fixed busses and trains in results activity
more generic overhaul
uncomment detail view to show nina
new carbon color scheme, based on carbon not duration
functionality, ui for presentation
most of my list

result cell, carbon color scheme
wifi connection check
avg carbon values view on main screen
added ui to main screen

deleted unecessary files