commit 12

fixed bugs before lesson 7