Merge branch 'master' of https://github.com/diestman/diestman

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/diestman/diestman