Merge branch 'david' of https://github.com/ddeleon93/Proyecto-Android
into david
Merge branch 'master' of https://github.com/ddeleon93/Proyecto-Android