Merge branch 'master' of https://github.com/yuvalka/Durak

Conflicts:
	.gitignore