Better calculator
Better calculator?

Merge branch 'master' of github.com:nguyenti/csc207-hw3

Conflicts:
	src/edu/grinnell/csc207/nguyenti/utils/Calculator.java