removing stry merge conflict marker
Merge branch 'master' of github.com:jensimmons/webahead-transcripts
Merge branch 'master' of github.com:jensimmons/webahead-transcripts
Merge branch 'master' of github.com:jensimmons/webahead-transcripts
Merge branch 'master' of github.com:jensimmons/webahead-transcripts
fixing mispelling of Nishant's name