refactored an if-statement
Merge branch 'master' of https://github.com/kvillert/Grupp1
Merge branch 'master' of https://github.com/kvillert/Grupp1
removed unnecessary code
working on animation
merging
fixed conflicts
merging
Merge branch 'master' of https://github.com/kvillert/Grupp1