Properly merged player
Merge branch 'Project-folder' of https://github.com/Pingli/PjBackToBasics into Project-folder