after kelsey committed
Merge branch 'master' of https://github.com/cadencegail/calculatorFinal
this is still so much fun