cm1 more generic + new cm1 class
lots of new detail changes
network stuff
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
blah new stuff