working on live test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/js/compiler.js
	src/js/simulate.js