bugs bugs bugs
Merge branch 'master' of github.com:DBrodsky90/Placeholdr_app into lauren
Merge pull request #64 from DBrodsky90/lauren

bringing myself up to date