Almost second runnable
Merge branch 'dev-hw4' of https://github.com/3Legs/w4118 into dev-hw4
Merge branch 'dev-hw4' of https://github.com/3Legs/w4118 into dev-hw4
Almost second runnable2
remove two locks
Merge branch 'dev-hw4' of https://github.com/3Legs/w4118 into dev-hw4