final changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	PHP Blog/projectPHP/viewpost.php