comiteo
Merge branch 'master' of https://github.com/stevenalvarez/patrocinalos_mobile

Conflicts:
	www/js/main.js
comiteo