assignment 1 final
Merge branch 'master' of https://github.com/oerlex/Programm-Solving-and-Programming.git
Merge branch 'master' of https://github.com/oerlex/Programm-Solving-and-Programming.git
Final version of assignment 2