correction errors
Merge remote-tracking branch 'origin/master'

Conflicts:
	content/uploads/images/3.jpg
	content/uploads/images/31.jpg
	content/uploads/images/4.jpg