added roster file.
Adding roster information
teaching about merge conflicts 2
Merge
Merge
Merge
last week's class work
Merge
work from class
Merge branch 'master' of github.com:codefellows/sea-c10-rubyonrails
Merge remote-tracking branch 'upstream/master'

Conflicts:
	roster.txt
	week2_homework/calculator.rb