Merge pull request #9 from MatthewViens/master

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

teaching about merge conflicts
fix the conflict
teaching about branches
causing a merge conflict
Merge branch 'matts'
week 2 homework"
work from class
finished calculator passing rpsec