Assignment Programming 2

Final version