updated
Merge remote-tracking branch 'origin/singlefile' into singlefile

Conflicts:
	Jenjens.js
fixed typo / added old code back in somehow??
Merge remote-tracking branch 'origin/singlefile' into singlefile

Conflicts:
	Jenjens.js
Merge remote-tracking branch 'origin/singlefile' into singlefile

Conflicts:
	Jenjens.js