ignore
Merge branch 'lauren' of github.com:DBrodsky90/Placeholdr_app into lauren
all user styling complete