changed Calculator and CalculatorFunctions to calculator and calculatorFunctions (don't know why I didn't just have them correctly fitting w/ standard nomenclature to begin with). Added a colon after the subtraction case in calculator.cpp to have it fit with the other function styles. Finally, updated the int used in the case switch to a double, that way when given input, I could use the floor of that input to account for being given non-integers. This did require the double to be typecasted to an int for the switch statement, however.