update gemfile by running bundle
Merge branch 'master' into kristen
run rake db:migrate
Merge branch 'kristen' of github.com:rmoshier/SeeMore-Salmon
remove stream