Conflicts:
Script.js
ScriptInterpreter.js
Transaction.js
test/testdata.js
...conflicts resolved by taking Manuel's changes, and then manually including
Matias's changes on those same files. The conflicts resulted from differences
in indentation, which is because Matias' changes unindendented all the code
that had been but is not now inside a function.
