update
Merge remote-tracking branch 'origin/master' into testing

Conflicts:
	makeArtExperimental.sh
	modules/links.txt
	modules/staff.txt
Merge pull request #2 from DigitalIRC/testing

Testing