Adding roster information
teaching about merge conflicts 2
Merge
Merge
Merge