fixing messed up shit
hopefully this doesn't ruin everything
Merge branch 'master' of https://github.com/nikakath/csc207-hw4

Conflicts:
	src/edu/grinnell/csc207/nikakath/hw4/Calculator.java
	src/edu/grinnell/csc207/nikakath/hw4/Fraction.java
	src/edu/grinnell/csc207/nikakath/hw4/FractionTest.java