Finished Lesson 5
Merge branch 'layout-branch'

Fixed previous merge problem.