game merge jerrutledge/master

Pull #2