Lab2

lab2 final merge to master