[task] ignore
Merge branch 'master' of github.com:odom/yiitemplatetest

Conflicts:
	.gitignore