trying to resolve conflict
Merge branch 'gh-pages' of github.com:nicoladt/nicoladutoit into gh-pages

Conflicts:
	_site/feed.xml