Cambiando palabras con acento
Merge branch 'master' of github.com:partedelcodigo/inf-a151

Conflicts:
	assets/www/companies.html