lecture 5
Merge branch 'master' of https://github.com/okulovsky/BasicProgramming

Conflicts:
fix
fix