Octopress init
Site updated at 2014-10-06 20:55:56 UTC
Site updated at 2014-10-06 20:57:22 UTC
Merge branch 'master' of https://github.com/merwan/merwan.github.io

Conflicts:
	atom.xml
	blog/2014/03/01/presentation/index.html
	blog/2014/03/03/premier-code-kata/index.html
	blog/2014/03/29/quand-utiliser-path-ou-url-avec-ruby-on-rails/index.html
	blog/archives/index.html
	blog/categories/javascript/atom.xml
	blog/categories/javascript/index.html
	blog/categories/kata/atom.xml
	blog/categories/kata/index.html
	blog/categories/rails/atom.xml
	blog/categories/rails/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css