.
Merge remote-tracking branch 'upstream/master'
'git fetch changes'
ZebraOTTChanges
Merge remote-tracking branch 'upstream/master'
'ZebraOTT'
Merge remote-tracking branch 'upstream/master'
'fetching the data'
codeUpdation of discountMaster
codeUpdation of promotion code
chargeCode&currency codeupdation
codeReview
manage data tables
Merge pull request #35 from raghuvissu/master

redemption changes
conflict after review
Merge remote-tracking branch 'upstream/master'
'After Conflicts'
..
Merge pull request #36 from LAshokReddy556/master

Code Review
.
after conflicts
Merge pull request #37 from Ranjith15/master

final cleanup of code
scripts changes
countrycurrency file  deleted