Updating my shreya branch

I need to update my branch with all the new file changes done in master.