First assignment completed
Merge branch 'assignment2'