implemented color coding of pours based on age of pour
fixed merge conflict