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

Conflicts:
	just_test_cpp/main.cpp
Update main.cpp
Merge pull request #1 from Mooophy/test_branch

Test branch