Laboration 2 commit #3

final commit