Delete conf file
Merge branch 'master' of github.com:sofiab/androidSenorProject