fix
Merge branch 'master' of github.com:jazonion/minimal-typecho

Conflicts:
	sidebar.php