Changes to TEAMBEST
Merge branch 'teambest' of github.com:chriscauley/intro-to-git into teambest