test
Merge branch 'master' of https://github.com/Sissinothere/Calculator

Conflicts:
	Logs.cpp