Merge pull request #1 from jerrutledge/master

Pull #2
Merge pull request #6 from noahmacaulay/master

game merge jerrutledge/master