git ignor
Merge branch 'master' of https://github.com/vorgoron/datewidget

Conflicts:
	.gitignore