Made some progress on battery history
Merge branch 'master' of https://github.com/codyplungis/Android_Project