Fixad c++11-syntaxen
mergat
modifierat structs...