Preferencias
Merge branch 'master' of https://github.com/adsgm/demos

Conflicts:
	.DS_Store
	index.html
Merge branch 'master' of https://github.com/adsgm/demos