teaching about branches
causing a merge conflict
Merge branch 'matts'
week 2 homework"
work from class
Merge remote-tracking branch 'cf/master'
turning in homework v1