Merge pull request #1 from ivan-bright/next

chapter 2 finished
chapter 4 completed
Merge branch 'master' of https://github.com/ivan-bright/be-happy
Merge pull request #3 from ivan-bright/next

Merge pull request #2 from brightbass/happybranchy
Merge pull request #4 from ivan-bright/master

merge master to next