Almost finishing, dealing with the scanner in GameImpl
Merge remote-tracking branch 'origin/master'