31 july
remove conflicts
work on upload logo
remove conflicts
work on upload logo 1 aug
add athontication to home controller
add athontication to home controller
Merge pull request #261 from vaibhavcisin274/poonam

Poonam
invoice show page implement calculation functionality #1Aug
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into vaibhav
Merge pull request #262 from vaibhavcisin274/vaibhav

Vaibhav
kamlesh confilict resolve