client_mail_history#20sep
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into prachi
working on to do list
remove conflicts
Merge pull request #409 from vaibhavcisin274/vaibhav

searching and product/service working 20-sep
Merge pull request #412 from vaibhavcisin274/anshul

Anshul
remove conflicts in estimate/show and gemlock#21 sep
Merge pull request #410 from vaibhavcisin274/prachi

Prachi
mail history 21-sep