Cleaned player and put methods in order
Merge branch 'master' of https://github.com/oskarjonefors/TDA367