add/subtract finished, edit also complete.
Merge branch 'master' of https://github.com/eronth/AlcCalc
mergefix