Merge remote-tracking branch 'zack/master'
games, gamesList classes adjustment
Merge remote-tracking branch 'lou/master'