removing cname
adding workshop
merge master