fixes and merge
Merge branch 'master' of https://github.com/NateTheGreatt/is421-calc