fixed display example
fixed comment
Merge branch 'master' of github.com:schnej7/js-emulation-framework

Conflicts:
	example/example.js