carEquivalents + fixed buses in main activity
fixed buses carbon calculations
bleh
Merge branch 'sumayyah'