Modified Makefiles (and some JS files) to have a rule to create regular array versions of the JS benchmarks
Merge conflict resolution