Merged with Lili's files.
Remove binding.pry.
Merged files updated.
Remove unnecessary text.
Update server file.
Merge pull request #8 from kizzle102/route_erb

Route erb