Compare commits

...
A pull request between these branches already exists: Conan_Doyl/Wiki#5

testing - Ein paar änderungen #5