test
meer
Merge https://github.com/MarinusW/dinges

Conflicts:
	.gitignore
	_config.yml
Merge pull request #5 from MarinusW/master

Master