Cambios insignificantes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.js
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 317313fba68bf2f6dafa36d453cce2aef45076a5.