Merge branch 'master' of C:\Users\jnolascob\Desktop\Roypi\Roypi with conflicts.
Merge remote-tracking branch 'origin/master'
Lista de actualizaciones:
- styles: colors, xml, actionbar, etc.