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

Conflicts:
	_site/feed.xml
Merge branch 'master' into gh-pages

Conflicts:
	_site/feed.xml
Merge branch 'master' into gh-pages

Conflicts:
	_site/feed.xml
xml feed wtf
Merge branch 'master' into gh-pages

Conflicts:
	_site/feed.xml
Merge branch 'master' into gh-pages

Conflicts:
	_site/feed.xml
Merge remote-tracking branch 'origin/master' into gh-pages
thumbs.db
more merging
more thumbs.db wtf
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
fixed head drama on index page
added alt tags, albeit in wrong branch
added robots.txt