final v0.1
Merge branch 'master' of https://github.com/reicker/mexchanger

Conflicts:
	aviso-de-privacidad.html
	terminos-condiciones.html