did stuff
Merge branch 'master' of https://github.com/henke101/DataStrukt
Merge branch 'master' of https://github.com/henke101/DataStrukt
Merge branch 'master' of https://github.com/henke101/DataStrukt
added stuff
added stuff
conflict done