fix staged after make
Add make_game test
Add river ordering
Enforce river picking order