commit para crear mi nuevo feature
commit por no seleccionar todo
c
Merge remote-tracking branch 'origin/master'

Conflicts:
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	android-support-v7-gridlayout/bin/android-support-v7-gridlayout.jar