test
Merge pull request #4 from MarinusW/master

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

Conflicts:
	.gitignore
	_config.yml