integrating angular, styling homepage, building ranking grid
fixing merge conflicts