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

Conflicts:
	StudyingController/StudyingController.v11.suo