Merge branch 'master' of http://github.com/jarmokivekas/printer
Merge branch 'fontedit' of http://github.com/jarmokivekas/printer
Minor advancements in the calculator program
Merge remote-tracking branch 'juhakivekas/master'