Merge master fixed conflict.
Merge branch 'master' of https://github.com/alexander-prutko/easy-algorithm