pankaj's info added to website
removed merge conflict in team_member.rb
Merge pull request #40 from pkrawat1/newtemplate

pankaj's info added to website