Added info to roster.txt
completing first assignment
Merge pull request #9 from MatthewViens/master

Added info to roster.txt
Update roster.txt
teaching about merge conflicts
trying to fix merge conflicts
Merge pull request #13 from reneedv/master

teaching about merge conflicts
trying to merge branches on roster.txt
fix the conflict
attempting to merge my name into roster.txt
Merge branch 'master' of https://github.com/xdothackerx/sea-c10-rubyonrails