Done with quantity dropdown
Resolved conflict
Added code for special price
Added code showng/hiding quantity div
chnage next and previous button in browse by category
removed comflict in files
remove all conflict in files
Merge pull request #22 from priyanka-techmaes/develop

Develop