some commit from last night
some merge
First commit for Assignment 2