first commit
Merge branch 'master' of github.com:mgardellini/scidate

Conflicts:
	.gitignore