Merge Error Test
Merge branch 'master' of https://github.com/OlegMatvejev/Test

Conflicts:
	HelloWorld.cpp