Bug Fixes
Merge branch 'master' of https://github.com/kylelin47/COP-Project

Conflicts:
	src/MultExpression.cpp
Added menu and addition of ints with fractions
small menu fix
Merge branch 'master' of https://github.com/kylelin47/COP-Project into workin

Conflicts:
	src/MultExpression.cpp
	src/Pi.cpp