testing changes ignore pls
updated makefile
Merge branch 'master' of https://github.com/bdgrider/calculator