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

Conflicts:
	Conta/Conta/Program.cs