update
Merge branch 'master' of http://github.com/tlwr/jspp

Conflicts:
	enumerable.js