ERROR
Merge branch 'gh-pages' of https://github.com/vince67/jekyll_vincent into gh-pages

Conflicts:
	_layouts/default.html
ARTICLE: set cronjob for django commands