Replaced old code with better version
Merge branch 'master' of github.com:oskarjonefors/TDA367
Commented out new code causing some problems