First commit for asg3, working version on structdef but not for statements
Fixed merge conflicts