fixed merge conflict
made headers pretty
Merge branch 'master' of github.com:mikobautista/BattleStocks
Merge branch 'master' of github.com:mikobautista/BattleStocks
fixed ranks