Integrating script updates from Torbjorn
Merge branch 'torbjorn-script-update'

Conflicts:
	animalhack-script.txt