buttons city
Merge pull request #7 from johnJudgeGriff/johnGriffin

John griffin
Adding player changes
Merging john branch with master