Garima Gupta
Updated team.html

Garima is added
Merge branch 'master' of https://github.com/Jayshri2014/preseed.github.io
temporary
adding garima
Updated team.html
Updated team.html
Updated team.html

Change in line of copyright
Updated media.html

change in line of copyright
Updated media.html

Added copyright
Merge remote-tracking branch 'upstream/pr/10'

Conflicts:
	team.html
Merge branch 'master' of https://github.com/preseed/preseed.github.io