Stuff
Merge branch 'master' of https://github.com/gdscheele/COP3503-Calculator

Conflicts:
	Euler.h
	Pi.h
	Solver.cpp