Filled in the layout, added bootstrap, and separated into partials.
Merge branch 'filling-in-layout' into ch5
Added content to Contact Page.
Fixed merge conflict.
Refactored rspec to use named routes.
Fixed merge.
Merge branch 'layout-links' into ch5
Stopping here for now so I can sleep.
Added layout links and corrected Contact test.
Merge branch 'links-in-layouts' into ch5
Merge github.com:haloflightleader/sample_app into ch5
Refactored tests to be more succinct.
Fixed the merge conflict.
Added a users controller.
Merge branch 'user-signup' into ch5
Merge branch 'ch5'