Implemented Contact Page, TODO: Style ALL added components
Changed Action Mailer authentication back to environment variables
Implemented Contact Page, TODO: Style ALL added components
Changed Action Mailer authentication back to environment variables
Fixed conflicts
deleted backups created from conflict
Merge pull request #8 from xiekevin/master

Implemented Contact Page, TODO: Style ALL added components