teaching about branches
causing a merge conflict
Merge branch 'matts'
week 2 homework"
work from class
Merge branch 'master' of https://github.com/codefellows/sea-c10-rubyonrails