Loaded graphics
Resolved missing files references
Fixed displaying Player
Resolved merge conflicts