Really committed changes to workshop 1

Also commited changes to workshop 2