adding in more derp to calculator
Merge branch 'master' of https://github.com/tdutton57/CS301