test
created local repo
tuesday commit
Tuesday commit
Merge branch 'master' of https://github.com/klon213/blogs into blogs

Conflicts:
	index.php
	protected/config/console.php
	protected/config/main.php
	protected/data/testdrive.db