Cleaned up code
Fixed merge conflicts
merge confs
Fixed high score bug
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.
Added credit message
Merge branch 'Oskar'
Added @author tags
Merge branch 'Jonte'