fix3
Merge remote branch 'origin/master'

Conflicts:
	404.html
	feed.xml
	index.html
	public/css/main.css