Merge branch 'INF2608-1st-Assignment'