merging changes from asitha
added actions and static pages to info controller
#29 Complete Home, About & Contact Pages
added pony config
merging two branches
added about page + route
#29 about, contact pages
fixing merge conflict in routes
Merge pull request #42 from asithade/googleplaces

Googleplaces
cleaned up conflict
#29 Complete Home, About, and Contact Pages- this commit is for Mary to have what I have. Not quite working yet.
added contact form, Dani & Mary built
added contact form Dani & Mary built
Merge pull request #43 from mfjenn/develop

Adding Contact Form with validation and errors
fixing merge conflict
Minor Fixes
Minor Fixes
#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