took out player.css that was unused and causing error
Merge branch 'staging'