Committing for pull. Nothing changed...
Merge branch 'master' of
https://github.com/COP3503Project-3-3/FancyCalc.git

Conflicts:
	FancyCalc/src/Multiplication.h
	FancyCalc/src/Rationals.h
Merge branch 'master' of
https://github.com/COP3503Project-3-3/FancyCalc.git

Conflicts:
	FancyCalc/src/Addition.h
	FancyCalc/src/Multiplication.h