Merge pull request #1 from sh-al/master

Delete deprecated staff
Add quiz2 and quiz3