nav fb and twitter links
Merge branch 'master' into ariel
Merge pull request #32 from fiftyandfiftyorg/ariel

Ariel