Uses fix
Merge branch 'master' of github.com:falsecz/beer-script

Conflicts:
	extras/coffee-script.js