added Kyogu's lab 3
merge