uncommenting game model
fixing merge conflict
implementing loading from csv
game options added
BADASS MVP
fix merge conflicts