commited
last update
Merge branch 'master' of https://github.com/IlyaKram/study_rep

Conflicts:
	Test/hello.cpp