fix
Merge branch 'master' of https://github.com/GiulioGx/Marinajo.git

Conflicts:
	MathMeMl/main.cpp