initial commit
Fix merge conflict: changes in worksheet.sty