add yii
Merge branch 'master' of github.com:GreyRaven/vykusi

Conflicts:
	test.txt