bugfix
Merge branch 'master' of github.com:hugohu/sallyjs

Conflicts:
	plugins/roll/roll.js