All files committed
Merge branch 'master' of https://github.com/xemkruz/DipDip

Conflicts:
	.gitignore