added workshops page
fixed merge