frontend
Merge branch 'master' of https://github.com/calblueprint/rtr4c into brian/frontend
a contact controller for a /contact page
Merge pull request #49 from calblueprint/kevin/contact_controller

a contact controller for a /contact page
Merge pull request #48 from calblueprint/emails

automated emails working
Merge pull request #50 from calblueprint/integrate_news

Integrate news
frontend
Merge pull request #51 from calblueprint/brian/frontend

Brian/frontend
fixed merge conflicts