resolved merge conflict
added helper methods for tests
changed instance variable to match story
seeder helper for tests
built image choice integration spec
resolving merge
resolved merge conflict
Merge pull request #91 from feministy/integration_tests

Integration tests-first build
add pop out window for print view
fixed merged conflict
Merge pull request #95 from feministy/print_window

add pop out window for print view
clean up merge to show story info properly
change links on mytales#show
create background_images table; update story model to reflect association; ran migration; seeds file updated to include background images
image for little red riding hood
browse stories page up and running
Merge pull request #97 from feministy/background-images

background images table added; browse library created
removed unnec column from people_images table
changed route to match goldilocks story number in heroku db
cleaned goldilocks story