first commit
Merge https://github.com/odedpr/konkur

Conflicts:
	.gitignore