Merge from Master
c
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	_site/feed.xml
Commit Feed
Commit
Modified file using Dillinger
Modified file using Dillinger
Merge remote-tracking branch 'origin/master' into gh-pages
Merge branch 'gh-pages' of https://github.com/fedpolbelgium/killers-brabant into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	_posts/facts/1982/1982-03-13-bayard-nl.markdown
	css/custom.css