2
Merge branch 'master' of github.com:mcupial87/kalkulator

Conflicts:
	test.txt