add media in ignore
resolved conflict in files
insert query
Merge pull request #71 from priyanka-techmaes/develop

Develop