Added a spec with "rails generate integration_test static_pages"
Made small changes.
Merge branch 'static_pages'
changed home.html.erb to pass request spec
modified Help page to pass rspec request spec
resolve conflict?
force conflict?
Will this force a merge? Let's see.
Did this finish the merge?
Added some new files.
Deleted the same files I added.
Added an About page.
Merge branch 'static_pages'
Did this commit just update my files, or was the merge enough?
Added an About page.
Did this merge work?
Changes to static pages, spec
Added dynamic content to static pages
Changed some dynamic text.
modified the application_helper.rb to define a full_title function