Merge branch 'yanrui_dev'
added workshop info
Update on Dec 18th
Merge branch 'master' of github.com:CopticScriptorium/site into yanrui_dev
Merged with master branch and did some minor fix