new project, part 1
Merge branch 'master' of https://github.com/jeremykainostraining/bestproject
broken project
Merge branch 'master' of https://github.com/jeremykainostraining/bestproject