Pooja/Sailee/Khushal : Resolving merge conflicts
Khushal/Sailee/Pooja:Test_Pyramid created with most recent test runs, Included no. of tests in the view  and  Refactored the code