*commit
Merge branch 'master' of https://github.com/ZuTa/StudyingController

Conflicts:
	StudyingController/UpgradeLog.htm
*commit
Merge branch 'master' of https://github.com/ZuTa/StudyingController

Conflicts:
	StudyingController/Artefacts/Tasks.docx
	StudyingController/UpgradeLog.htm
*
Merge branch 'master' of https://github.com/ZuTa/StudyingController
visitings