Merge branch 'master' of github.com:DBrodsky90/Placeholdr_app into lauren
Merge branch 'master' of github.com:DBrodsky90/Placeholdr_app into lauren
updated the routes file, added commas to the seed file
Merge pull request #21 from DBrodsky90/lauren

added a few things to route file, added commas to seed