First commit for asg2
Merged with Michael