Merge branch 'master' into ting_branch_2
seeding data with FactoryGirl and Faker. changed database schema to reflect Dave's changes to the models/tables
Merge branch 'master' into ting_branch_2
renaming a migration file
modifying database connection and models/tables a bit
Seeding data: presentations, slides, and survey options
Seeding data: all done
Merge branch 'ting_branch_2'