Fix syntax errors.
Merge branch 'master' into game
Fix merge conflict.
Merge pull request #2 from aleung013/game

Add bull and makeCall functions. Fix some syntax errors