Merge branch 'master' of https://github.com/vivekrao/Team3_Task7.git
update
Configuration file