commit con el log out
Merge branch 'master' of github.com:fititrick/GramolaProject

Conflicts:
	mobile/code/index.html