2nd commit

testcommit
Merge branch 'internship_issues' of https://github.com/andreas-wi/africa into internship_issues