Update roster.txt
teaching about merge conflicts
Merge pull request #13 from reneedv/master

teaching about merge conflicts
fix the conflict
Merge pull request #1 from codefellows/master

pull request