Expanded Calculator.java, and made edits to Fraction.parseFraction(String) and CalculatorUI
Merge branch 'master' of https://github.com/tranchri/csc207-hw4

Conflicts:
	src/edu/grinnell/csc207/tranchri/deweytyl/frac/Calculator.java
	src/edu/grinnell/csc207/tranchri/deweytyl/frac/Fraction.java

Merged this brance and master branch.