Added parseFraction(String) method to Fraction.java
Merge branch 'master' of https://github.com/tranchri/csc207-hw4

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

Resolved conflict of toString and parseFraction