lab_3_and_homework_2
Merge pull request #34 from Lacroix08/master

lab_3_and_homework_2