editing readme
Merge pull request #121 from DBrodsky90/amanda

editing readme
editing readme
Merge pull request #122 from DBrodsky90/amanda

editing readme
editing readme
Merge pull request #123 from DBrodsky90/amanda

editing readme
Merge pull request #120 from DBrodsky90/lauren

navbar up and working
editing readme
Merge pull request #124 from DBrodsky90/amanda

editing readme
editing readme
Merge pull request #125 from DBrodsky90/amanda

editing readme
editing readme
Merge pull request #126 from DBrodsky90/amanda

editing readme
editing readme
Merge pull request #127 from DBrodsky90/amanda

editing readme
Merge branch 'master' of github.com:DBrodsky90/Placeholdr_app into lauren
merge error