Meh
Merge branch 'master' of https://github.com/COP3503Group3-4/Calculator-Project

Conflicts:
	CalculatorProject/.cproject
	CalculatorProject/Ops/Add.h
	CalculatorProject/Ops/Multiply.h
	CalculatorProject/Ops/add.cpp
	CalculatorProject/Ops/multiply.cpp
	CalculatorProject/Ops/subtract.cpp
	CalculatorProject/Values/Header_Files/Value.h