finished again
Merge branch 'master' of https://github.com/KrbAlmryde/HW1