just removed syso
fixed merge conflicts
fixed merge conflicts
added layering image
Moved out main class
Merging

ote-tracking branch 'origin/master'

# 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.
sage aborts
# the commit.
added DoT tower
merge
Fixed dependency problems between io and maps
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.
Merge branch 'Jonte'