add win?
Merge branch 'master' of https://github.com/meteorgan/games
resolve conflict