Store both lineups on Game

[Finish #58941450]
Merged heroku conflicts. [#58939418]
Merged heroku conflicts. [#58939418]
Fix missed merge conflict. [#59291992]