Merge branch 'master' into 'master'

Homework Anna Pillwitz + Jana Sophia Ulrich

Dear Thomas, 

Jana doesn't have her login-stuff yet, so don't be too surprised that you'll find two new files. :) I hope it's fine. It's both mine (Anna) and Janas homework. 

See you tomorrow, 
best regards
Anna & Jana

See merge request !21