Update seeds.rb
Update schema.sql
Update boot.rb
Merge branch 'master' of github.com:h4w5/dvr_app
merge
fixing merge conflicts
adding changes
adding homework