Update
Merge branch 'master' of https://github.com/lenvon2012/code

Conflicts:
	Test/Test.txt