Moving where stuff is
Merge branch 'master' of https://github.com/mehals/PlusOnePlayer