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

Conflicts:
	src/Tester.java
	src/model/VM/JsVm.java
	tests/basic.js