#
#add new tasks
#fix
Merge branch 'master' into Danil_Agafonov

Conflicts:
	Решения/Матрица/src/Matrix.class
	Решения/Матрица/src/Matrix.java