a
a
Merge branch 'master' of github.com:iistvan/conta

Conflicts:
	Conta/Conta/obj/Debug/Conta.csproj.FileListAbsolute.txt
bla