Merging conflicts solved.
Merge branch 'boundary_handling' of https://github.com/hackerbruecke/cfd03.git into boundary_handling