client changes
change s in client controller
Merge branch 'master' into vaibhav
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project
category module poonam
Merge branch 'master' of heroku.com:invoice-project
changes in client index and show page design
Merge branch 'master' into vaibhav
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project
Merge pull request #2 from vaibhavcisin274/vaibhav

Vaibhav
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project
estimate module vaibhav start
Merge pull request #7 from vaibhavcisin274/vaibhav

Vaibhav
change in task module-29
edit profile
Merge pull request #9 from vaibhavcisin274/dinshaw

edit profile
Update Gemfile

remove extra debugger
merge anshul with master
remove conflict from master
conflicts solve