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

Conflicts:
	www/css/main.css
	www/index.html
	www/js/config.js
	www/js/main.js