endret size
Merge remote-tracking branch 'origin/master'

Conflicts:
	kalkulator/src/gui/main.java