Removed some unnecessary rows and renamed some variables and so on
Merge branch 'master' of https://github.com/kvillert/Grupp1