updated policy to include privacy, post, attribution
fixed policy page header syntax
fixed policy page header syntax
got rid of merge conflict detritus in policy.md
Merge branch 'master' of github.com:CenterForOpenScience/osc

Conflicts:
	site/content/pages/policy.md
Merge pull request #41 from shaunagm/master

Gets rid of merge conflict syntax in policy.md
Merge pull request #1 from CenterForOpenScience/master

Continuing attempt to fix policy page