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