1 0f 52 - chantal
Merge branch 'master' of https://github.com/janvt/portfolio_content

Conflicts:
	articles.csv