Mas links
a
Merge branch 'master' of
https://github.com/rnrneverdies/siete-reinas.git

Conflicts:
	public/footer.html
	public/saludos.html