rebase and fix default game mode issue
next time we use darcs
Merge branch 'ronwork'
Merge branch 'fuck-version-control-i-hate-you-all-dash-work'