done add location
resolved conflicts in files
removed static address in contact us page
Merge pull request #52 from priyanka-techmaes/develop

Develop