fix stuff.
Merge branch 'master' of https://github.com/nchu1209/Take-Two