Merge branch 'master' of https://github.com/mstepan/incubator.git

Conflicts:
	algorithms/src/main/java/com/max/algs/AlgorithmsMain.java
ttt