Add down
Merge branch 'master' of https://github.com/krongk/six-five

Conflicts:
	public/templetes/syrena/_header.html
	public/templetes/syrena/temp_article_detail.html
Add merge