added info for ashish singh
updated info for ashish singh
Merge pull request #39 from ashish173/newtemplate

Updated info for ashish singh
removed merge conflict in team_member.rb