working on stuff
Add support for changing confiuration while playing

When the user clicks the cog button on the play page, they are taken back to the
new page, and then they have two buttons, "continue game", or "new game". If
they click continue, they are taken back to the play page, to where they can
continue from where they left off.

To Do:
  - Detect when settings change in such a way that the "continue" button no
    longer makes sense (Changing any variant options)
  - Add support for game specific config settings. Basically add a "what do you
    want to save" and "restore saved stuff" callback for the game to
    (optionally) implement.
Merge branch 'master' into settings-page

Conflicts:
	assets/javascripts/GCAPI.coffee
	assets/javascripts/ui.coffee
Fix botched merge.
fix bug on page when not editing config
Fix human/computer selector when not editing config
Fix to work with c
Reset master.
Merge pull request #3 from GamesCrafters/settings-page

Add support for changing configuration while playing
Merge branch 'master' of git://github.com/GamesCrafters/Gamesman5
Merge branch 'vvh-work'

Conflicts:
	assets/javascripts/vvh.coffee
Add branching tutorial to README
Merge remote-tracking branch 'origin/master' into vvh-work

Conflicts:
	assets/javascripts/vvh.coffee
Merge branch 'vvh-work' of github.com:GamesCrafters/Gamesman5 into vvh-work