Add game functions
Add game end options
Merge branch 'master' into edits