.
Merge remote-tracking branch 'upstream/master'
'korta changes'
.
master fetching
Merge remote-tracking branch 'upstream/master'
'Merging from master'
merge conflicts
Merge remote-tracking branch 'upstream/master'
'Merge Conflict'
Merge remote-tracking branch 'upstream/master'
'Merge Pull Request'
Merge remote-tracking branch 'upstream/master'
'paypal popup'
Merge remote-tracking branch 'upstream/master'
'merging'
.
Merge pull request #347 from LAshokReddy556/master

Master changes