Assignment 1 complete
mergind issue, fixed?