My commit
Merge branch 'master' of github.com:Yelisey/helloWorldProgect

Conflicts:
	testTemplate.suo