more js refactor-still has a way to go
Merge branch 'master' of https://github.com/feministy/littlebooks into homepage_js
migrations to drop ethnicity table and two new columns to story table
Merge branch 'master' of https://github.com/feministy/littlebooks into updating_migrations
Merge branch 'master' of https://github.com/feministy/littlebooks into updating_migrations
updated tests to reflect changes we did with migration and our models
removed ethnicity model and tests
fixed typo in migration file
reconfigured to support travis
to support travis ci
Merge pull request #62 from feministy/travis_fix

Travis fix
seeding test databases so test do not fail
Merge pull request #63 from feministy/another_travis

seeding test databases so test do not fail
Merge pull request #60 from feministy/updating_migrations

Updating migrations to add columns to story table and drop ethnicity table
fixed merge conflicts
Merge pull request #64 from feministy/homepage_js

Homepage JavaScript for interactive typing/editing with refactoring
fixed merge conflict