Merge branch 'master' of https://github.com/dimosarts/2014-autumn-informatics
Merge branch 'master' of https://github.com/dimosarts/2014-autumn-informatics

Conflicts:
	Касымханов Жамиль/ARRAY1.pas
	Касымханов Жамиль/MATRIX1.pas
	Касымханов Жамиль/STRING.pas