cleans up comments from merge conflict.
Merge branch 'dev' of https://github.com/cs3733bdt/wpi-suite into dev
Fixes save game and launch game buttons from the edit panel so that existing games can be both updated and launched.
Merge branch 'dev' of https://github.com/cs3733bdt/wpi-suite into dev
set up structure to fill out the date and time combo boxes on the edit game page. Creates function to set fields of a game and update the model and server.

Contributors: TomPAolillo, Chris Knapp
Merge branch 'dev' of https://github.com/cs3733bdt/wpi-suite into dev
Merge branch 'dev' of https://github.com/cs3733bdt/wpi-suite into dev
Merge branch 'dev' of https://github.com/cs3733bdt/wpi-suite into dev