Merge pull request #1 from Hohenheimsenberg/master

Agregando Grafica en tiempo real
moved files
modifications to server.js
added gitignore
agregar UNE a data.json
Agregue que aumente la UNE
Revert "ignored files"

This reverts commit 1e25c156541feb30e233ffb5890ca517bbeac622.
merge main
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mockup/server.js
merge upstream