done contact us page
resolved conflicts
Merge pull request #84 from priyanka-techmaes/bugs-develop

done contact us page