Fix solution problems after merge conflicts
Add file for player class
Merge pull request #6 from Andreis13/master

Fix problems after merge conflicts