corrected conflict
resolt conflict
Merge branch 'master' of https://github.com/enavar/UlisesMap