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

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

Conflicts:
	youCourse/protected/runtime/application.log
	youCourse/protected/views/site/pages/testJson.php
he
Merge branch 'master' of https://github.com/hamisto27/wis-project-1
nothing
Merge branch 'master' of https://github.com/hamisto27/wis-project-1

Conflicts:
	youCourse/protected/runtime/application.log
Merge remote-tracking branch 'origin/master'