Merge branch 'Ranjith15-master'
Merge branch 'master' of https://github.com/mujeeb1238/settlement