Merge pull request #454 from vaibhavcisin274/prachi

remove conflicts#25oct
remove the conflicts#28oct
Merge branch 'prachi' of github.com:vaibhavcisin274/invoice-project into prachi
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into prachi