Testing commit/merge
Merge branch 'master' of https://github.com/abartolo/is217-worldcup into Alex_Branch
Merge pull request #1 from abartolo/Alex_Branch

Alex branch