trying to fix some changes
a working gamescreen - not all functions implemented yet though
fixing merge conflicts
fixing merge conflicts again