grading and change for assignment 1
Merge remote-tracking branch 'origin'
grading and bugfix for assignment 2
grading for assignment 3
grading for assignment 5
Merge remote-tracking branch 'origin'
grading for final