Update resources for Oct. 25 workshop
Resolve merge conflicts