Code.js Esteban
Merge branch 'master' of github.com:fititrick/GramolaProject

Conflicts:
	code.js
Otro puto commit.
Merge branch 'master' of github.com:fititrick/GramolaProject

Conflicts:
	code.js