better way to randomize
Merge branch 'master' into beta

Conflicts:
_lib.js
Revert aa94fe2..7c8dae2

This rolls back to commit aa94fe23bf0d4b0bc047e47148dcbe72b4fae19c.
Merge branch 'beta'

Conflicts:
	_lib.js
removed logging