added roster file.
Adding roster information
teaching about merge conflicts 2
Merge
Merge
Merge
Merge
syncing with class repo
syncing files