first commit
Merge branch 'master' of github.com:jartek/main

Conflicts:
	.gitignore