merging
merging again
merge
mergeMerge branch 'dev' into g-details
Merge pull request #20 from Swap-Meet/marissa

Marissa
merge
formatting game details
Merge pull request #21 from Swap-Meet/g-details

G details
more modules