error update
Merge branch 'master' of https://github.com/kthffmn/gametime into beta