Merge branch 'release/chapter_4' into develop
left off at Listing 5.2
adding the rails logo and bootstrap sass
completed up to Listing 5.7
completed 5.1
completed 5.2
completed 5.3.3
completed 5.3
completed the filling-in-layout
Merge branch 'feature/filling-in-layout' into develop
finished the chapter 5
Merge branch 'release/chapter_5'