Testing branches and commits.
Committing an updated version of the player class so Jeff can see it.
Merge pull request #2 from VitusVarian/Mac2

Mac2