Gone but not forgotten
Merge branch 'master' of https://github.com/freeITathens/freeitathenscode

Conflicts:
	Legacy/BPR_xt_lubuntu_32bit.sh
	Legacy/Quality Control.desktop
	Legacy/image_prepare.sh
	Legacy/image_update.sh
	Legacy/intro_ubuntu.desktop
	Legacy/watch_intro
	QC_Process/Quality Control.desktop
	Retired/BPR_xt_lubuntu_32bit.sh
	Retired/Quality Control.desktop
	Retired/image_prepare.sh
	Retired/image_update.sh
	Retired/intro_ubuntu.desktop
	Retired/watch_intro
	image_scripts/BPR_xt_lubuntu_32bit.sh
	image_scripts/image_prepare.sh
	image_scripts/image_update.sh
	image_scripts/intro_ubuntu.desktop
	image_scripts/watch_intro