added custom buttons textviews and  edittexts
first iteration of flight detail view
second iteration of flight detail view
added flight and train detail views with functionality
Merge branch 'joey_organized'

Conflicts:
	CarbonFlights/src/main/java/edu/davis/carbonflights/ResultsAdapter.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/Utility/NetworkManager.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/Utility/NewAdapter.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/activity/DetailActivity.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/activity/MainActivity.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/activity/ResultsActivity.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/api/CM1.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/api/Group.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/api/Hash2D.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/api/Rome2Rio.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/network/NetworkManager.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/transport/Flight/Flight.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/utility/NetworkManager.java
	CarbonFlights/src/main/java/edu/davis/carbonflights/utility/NewAdapter.java
	CarbonFlights/src/main/res/layout/activity_main.xml
	CarbonFlights/src/main/res/values/color.xml