Signed-off-by: Andrew Porter <mephisto83@hotmail.com>
Merge branch 'master' of https://github.com/mephisto83/MEPH

Conflicts:
	meph/specs/math/Expression_2.spec.js
	meph/src/math/Expression.js
	meph/src/math/ExpressionTranslation.js