Merged temp.cpp

Merged the code in temporary GameController into main GameController,
and deleted temp.cpp.