Merge branch 'master' of https://github.com/ST3tter/PA2-Doku

Conflicts:
content/5_software.tex
test