Merge branch 'master' of https://github.com/ccastillosoler/Codigo.git

Conflicts:
	Mindfulness/assets/www/js/index.js
	Mindfulness/assets/www/menu.html
Recopilando los cambios