Update main.cpp
Merge branch 'master' of https://github.com/Mooophy/cpp-test

Conflicts:
	just_test_cpp/main.cpp