init
Merge branch 'master' of https://github.com/nr4bt/dialogplus

Conflicts:
	.gitignore
merge