basic
Merge branch 'master' of https://github.com/RRozza/DC-Obligatorio

Conflicts:
	tests/basic.js
commit final