Assignment 1 done
Code shown in class
Assignment 2 done
Merge branch 'assignment-2'