Merge branch 'master' of github.com:WebReflection/es6-shim

Conflicts:
	es6-sham.js
Merge branch 'master' of github.com:WebReflection/es6-shim