New post
Merge branch 'master' of github.com:yoksel/_static_site

Conflicts:
	atom.xml