* initial commit for lab4
* old lab3 changes