morning pull 28 aug
changes in paypal
changes
remove conflicts
Remove bugs#29Aug
Conflicts remove#29Aug
client layout correct 29 aug
remove conflicts
Merge pull request #317 from vaibhavcisin274/vaibhav

Vaibhav
chages the icone of facbook and twitter and set gui of project 29_evening_poonam
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into manish
Merge pull request #318 from vaibhavcisin274/vaibhav

facebook login #29-aug
changes
Merge pull request #319 from vaibhavcisin274/manish

Manish
Print functionality on all#29Aug
Conflicts remove in user model and project/form#29Aug
Merge pull request #320 from vaibhavcisin274/prachi

Prachi
solve fb login error #29-Aug