merge lab3
merge
some tinkering during lab