Update HW2
lecture 5
added lab5
Commiting changes
 solving conflict
 added my file