Standard Methods
Merging

Merge branch 'master' of https://github.com/nikakath/csc207-hw4

Conflicts:
	src/edu/grinnell/csc207/nikakath/hw4/Fraction.java
Adam's Changes

Merge branch 'master' of https://github.com/nikakath/csc207-hw4
Typo Edit
Calculator

Merge branch 'master' of https://github.com/nikakath/csc207-hw4