init git
Merge branch 'master' of github.com:walkskyer/yiitest

Conflicts:
	.gitignore