started fixing errors in test classes, added main menu button to new game menu
fixed render for main menu button in high score view
merge
Fixed menu buttons
fixed merge conflicts
Merging with Sebbe

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.