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