notas
Merge branch 'master' of https://github.com/pokaxperia/quien_compro

Conflicts:
	index.html