Refactored player
Fixed errors and refactored
Refactored player
Merge pull request #13 from NicolePell/master

Refactoring, fixing errors