Merge branch 'master' of srv.thomaswucher.de:studium/modprog
Merge branch 'master' of github:therealshredder/TacZombie