initial
Merge branch 'master' of https://github.com/andrejlola/yii2blog

Conflicts:
	.gitignore