Finished task A2 (I think) v2

Small adjustment, code looks nicer. I think I did A2.

Should we do every task in one python-file or does Sondre want separate
.py-files per task?