spining up the UI
Merge branch 'master' of https://github.com/joeyjiron06/CarbonFlights

Conflicts:
	CarbonFlights/src/main/java/edu/davis/carbonflights/NewAdapter.java

CarbonFlights/src/main/java/edu/davis/carbonflights/ResultsActivity.java
	CarbonFlights/src/main/res/layout/activity_results.xml
	CarbonFlights/src/main/res/layout/childrow.xml