#29 Complete Home, About & Contact Pages
#29 about, contact pages
fixing merge conflict in routes
#29 Complete Home, About, and Contact Pages- this commit is for Mary to have what I have. Not quite working yet.
fixing merge conflict
#29 About, Contact pages
Merge branch 'develop' of https://github.com/asithade/crispychicken into develop
Merge pull request #45 from danisyellis/develop

Probably the final version of #29 for this sprint- merged Mary's and my code