Merge origin/master

Conflicts:
	src/fraccalc/backEnd/Fraction.java
	src/fraccalc/backEnd/OperatedFraction.java
	src/fraccalc/frontEnd/Parser.java

Also some other stuff.