update lab 6 and 7, lectures 2-6, 3-1 and 3-2
update lecture 3-2 and lab-7
weird merge fix