Exercise 16 & merging lcthw dir from other computer
Fix merge conflicts