worked on playerpanel
Merge pull request #246 from HoltMaki/master

worked on playerpanel