fractional
fractional commit
Merge branch 'master' of https://github.com/mulias/csc207-hw4

Conflicts:
	src/edu/grinnell/csc207/hw4/Calculator.java