new commit
Merge branch 'master' of github.com:maksymcierzniak/kohanablog

Conflicts:
	kohana/application/bootstrap.php
commit
fixed paths