Nåt...
Fixade merge conflict
Merge branch 'boxset' of https://github.com/Sebelino/Team18v2 into boxset
Mergade AI.cpp och sokoban.cpp