Cosmetic changes
Merge remote-tracking branch 'origin/master'

Conflicts:

	obdEnergy/src/main/java/com/example/obdenergy/obdenergy/Activities/GraphsFragment.java