Basic update
Added Expression, other updates
Merge branch 'master' of https://github.com/NGoldfarb/Calculator.git

Conflicts:
	Calculator/Expression.cpp
	Calculator/Expression.h
	Calculator/Number.h

	EVERYTHING