Merge pull request #9 from htwg-syslab-bsys-ws17/manuelVo-patch-1

Fix errors in hw0 that occured during the presentation

hw0/gittask0/README.md

 * Erstelle einen Pull-Request von _hw0-UserB_ auf _hw0_.
   **Konflikt tritt auf!**
 
-### User A @ Container
+### User B @ Container
 ```bash
 git checkout hw0
 git pull
 git checkout hw0-UserB
-git merge hw0-UserA
+git merge hw0
 # edit SOLUTIONS.md
 git commit -v SOLUTIONS.md
 git push