Add some comment
Add some comments
Add some comments
Merge branch 'master' of https://github.com/String1415BIM/TP_String_1415

Conflicts:
	test_main.cpp