g+ Sign in button
Merge branch 'master' of https://github.com/jagspage2013/AppPuntoYComa

Conflicts:

app/src/main/java/mx/unam/saic/puntoycoma/controladores/MainActivity.jav
a
	app/src/main/res/layout/activity_main.xml