Cleaned up code
Fixed merge conflicts
Upgrade bug fixes
Merge branch 'master' into Jonte
merge confs
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
Added test for DoT-curse and fixed bugs
Fixed upgrade bug and some info design
Merge branch 'Jonte'
Wrote test for slowing curse
Merging

nch 'master' of https://github.com/05K4R/OOP-Projekt-grupp-16

# 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.