Initial commit
hoi dani
conflict
Conflict
conflict-solved
hel
asdf
Änderung 1
Änderung 2 (arktokrates)
Merge branch 'master' of https://github.com/Liechtathlet/GroupWork
...