updated and finalized workshop format
fixed merge conflicts