not sure what this commit is for, I shouldn't have anything
Merge github.com:Logicon211/LAMER

Conflicts:
	objects/hue_2_o.object.gmx
	objects/hue_glow_o.object.gmx
	objects/hue_prime_o.object.gmx
	objects/sat_2_o.object.gmx
	objects/sat_glow_o.object.gmx
	objects/sat_prime_o.object.gmx
	objects/val_2_o.object.gmx
	objects/val_glow_o.object.gmx
	objects/val_prime_o.object.gmx