primer commit:modificacions
Merge branch 'master' of https://github.com/carles-ruis/android-trackme