meno
Merge branch 'master' of https://github.com/AlTech98/CalcolatriceCpp

Conflicts:
	main.cpp
aa