merging changes from asitha
added actions and static pages to info controller
added pony config
merging two branches
added about page + route
cleaned up conflict
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