re-starting things
Merge branch 'master' of https://github.com/sinahab/ENPH-479-Android-App