Merge branch 'OperatorOverload'

Conflicts:
	FunctionLibrary/teste.cpp
Merge branch 'master' of https://github.com/MEHFM/TrabalhoMN1

Conflicts:
	FunctionLibrary/teste.cpp