Validating the equation
Merge remote-tracking branch 'origin/master'

Conflicts:
	source code/main.cpp