Merge branch 'master' of https://github.com/hamisto27/wis-project-1

Conflicts:
	youCourse/protected/runtime/application.log
Merge branch 'master' of https://github.com/hamisto27/wis-project-1
Merge branch 'master' of https://github.com/hamisto27/wis-project-1

Conflicts:
	youCourse/protected/runtime/application.log