merge
Merge branch 'master' of https://github.com/qitar888/grad66th
renewed many things about activities and not yet finished