minor problem fixed
Merge branch 'master' of https://github.com/nitestryker/phpbin

Conflicts:
	templates/post.tpl.php