cahnges
20 august morning pull
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into poonam
changes in application.rb
Merge pull request #328 from vaibhavcisin274/poonam

Poonam
Merge pull request #329 from vaibhavcisin274/manish

Manish
dash board error remove
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project
redirect path changes #30-aug login after pop-up show
Merge pull request #330 from vaibhavcisin274/vaibhav

Vaibhav
delete js
caloclation problem solve  #30-Aug
Merge pull request #331 from vaibhavcisin274/vaibhav

caloclation problem solve  #30-Aug
solved issue 30-aug
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into anshul
30Aug products & services remove bugs
Merge pull request #332 from vaibhavcisin274/anshul

Anshul
Conflicts remove in application.html
remove conflicts
Merge pull request #333 from vaibhavcisin274/prachi

Prachi