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
application file changes#28oct
Merge pull request #455 from vaibhavcisin274/prachi

Prachi