tags to post - not working yet
Merge remote-tracking branch 'origin/master'

Conflicts:
	add_post.php
	resources/func/blog.php