hwk12 finished
hwk 12 merge