blah
Merge branch 'master' of https://github.com/sumayyah/OBDEnergy

Conflicts:

obdEnergy/src/main/java/com/example/obdenergy/obdenergy/MainActivity.jav
a