GameListController and GameController working
Fix conflicts (sorry, my bad)