working
resolved conflicts
done get city and location
done address issue
Merge pull request #82 from priyanka-techmaes/bugs-develop

Bugs develop
Wrokign on some categories are not getting displayed
Merge branch 'develop' of https://github.com/priyanka-techmaes/kisanfarms into develop
done contact us page
Merge pull request #83 from priyanka-techmaes/script-disable

Done with java script disable page
resolved conflicts
done cart popup
Added spritesheet for new rupee sign