merge
Merge branch 'master' of https://github.com/PhilippGronotte/DalgoProjekt1
Last changes in comments and names of variables