Ton of bug fixes
Merge branch 'master' of https://github.com/kylelin47/COP-Project into workin

Conflicts:
	src/MultExpression.cpp
	src/Pi.cpp
Merge pull request #26 from kylelin47/workin

Ton of bug fixes