Merge branch 'varun'
standings
Merge branch 'master' into varun
changed colors
fixed initial bug
local changes for views adding logos
form change