final, 3 fixed
Merge branch 'master' of https://github.com/gaida/D-A_algo1