player splash page updated with span
resolved merge conflict
fixed padding of navbar
Fixed font uppercase
Merge branch 'master' of github.com:mikobautista/BattleStocks