Teams nearly complete, and formatted all the files
Merge remote-tracking branch 'origin/master'
Teams nearly complete, and formatted all the files