second commit for homework
second commit for Homework
merged after git pull conflict thingie