game fps set to 30
Merge remote-tracking branch 'github/master'
game fps set to 30